diff --git a/.configurations/configuration.dsc.yaml b/.configurations/configuration.dsc.yaml new file mode 100644 index 00000000000..41839b86f23 --- /dev/null +++ b/.configurations/configuration.dsc.yaml @@ -0,0 +1,67 @@ +# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2 +# Reference: https://github.com/microsoft/vscode/wiki/How-to-Contribute +properties: + resources: + - resource: Microsoft.WinGet.DSC/WinGetPackage + directives: + description: Install Git + allowPrerelease: true + settings: + id: Git.Git + source: winget + - resource: Microsoft.WinGet.DSC/WinGetPackage + id: npm + directives: + description: Install NodeJS version >=16.17.x and <17 + allowPrerelease: true + settings: + id: OpenJS.NodeJS.LTS + version: "16.20.0" + source: winget + - resource: NpmDsc/NpmPackage + id: yarn + dependsOn: + - npm + directives: + description: Install Yarn + allowPrerelease: true + settings: + Name: 'yarn' + Global: true + PackageDirectory: '${WinGetConfigRoot}\..\' + - resource: Microsoft.WinGet.DSC/WinGetPackage + directives: + description: Install Python 3.10 + allowPrerelease: true + settings: + id: Python.Python.3.10 + source: winget + - resource: Microsoft.WinGet.DSC/WinGetPackage + id: vsPackage + directives: + description: Install Visual Studio 2022 (any edition is OK) + allowPrerelease: true + settings: + id: Microsoft.VisualStudio.2022.BuildTools + source: winget + - resource: Microsoft.VisualStudio.DSC/VSComponents + dependsOn: + - vsPackage + directives: + description: Install required VS workloads + allowPrerelease: true + settings: + productId: Microsoft.VisualStudio.Product.BuildTools + channelId: VisualStudio.17.Release + includeRecommended: true + components: + - Microsoft.VisualStudio.Workload.VCTools + - resource: YarnDsc/YarnInstall + dependsOn: + - npm + directives: + description: Install dependencies + allowPrerelease: true + settings: + PackageDirectory: '${WinGetConfigRoot}\..\' + configurationVersion: 0.2.0 diff --git a/.devcontainer/install-vscode.sh b/.devcontainer/install-vscode.sh index 9d4b52755d9..cc70d527acd 100755 --- a/.devcontainer/install-vscode.sh +++ b/.devcontainer/install-vscode.sh @@ -9,4 +9,4 @@ sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.mi rm -f packages.microsoft.gpg apt update -apt install -y code-insiders libsecret-1-dev libxkbfile-dev +apt install -y code-insiders libsecret-1-dev libxkbfile-dev libkrb5-dev diff --git a/.eslintplugin/code-amd-node-module.ts b/.eslintplugin/code-amd-node-module.ts new file mode 100644 index 00000000000..35c89dcb219 --- /dev/null +++ b/.eslintplugin/code-amd-node-module.ts @@ -0,0 +1,60 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as eslint from 'eslint'; +import { join } from 'path'; + + +export = new class ApiProviderNaming implements eslint.Rule.RuleModule { + + readonly meta: eslint.Rule.RuleMetaData = { + messages: { + amdX: 'Use `import type` for import declarations, use `amdX#importAMDNodeModule` for import expressions' + } + }; + + create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener { + + const modules = new Set(); + + try { + const { dependencies, optionalDependencies } = require(join(__dirname, '../package.json')); + const all = Object.keys(dependencies).concat(Object.keys(optionalDependencies)); + for (const key of all) { + modules.add(key); + } + + } catch (e) { + console.error(e); + throw e; + } + + + const checkImport = (node: any) => { + + if (node.type !== 'Literal' || typeof node.value !== 'string') { + return; + } + + if (node.parent.importKind === 'type') { + return; + } + + if (!modules.has(node.value)) { + return; + } + + context.report({ + node, + messageId: 'amdX' + }); + } + + return { + ['ImportExpression Literal']: checkImport, + ['ImportDeclaration Literal']: checkImport + }; + } +}; diff --git a/.eslintplugin/code-import-patterns.ts b/.eslintplugin/code-import-patterns.ts index 07efb11b058..1f08bb4a4e8 100644 --- a/.eslintplugin/code-import-patterns.ts +++ b/.eslintplugin/code-import-patterns.ts @@ -180,8 +180,9 @@ export = new class implements eslint.Rule.RuleModule { const restrictions = (typeof option.restrictions === 'string' ? [option.restrictions] : option.restrictions).slice(0); if (targetIsVS) { - // Always add "vs/nls" + // Always add "vs/nls" and "vs/amdX" restrictions.push('vs/nls'); + restrictions.push('vs/amdX'); // TODO@jrieken remove after ESM is real } if (targetIsVS && option.layer) { diff --git a/.eslintplugin/code-no-native-private.ts b/.eslintplugin/code-no-native-private.ts new file mode 100644 index 00000000000..4d6be23b8f3 --- /dev/null +++ b/.eslintplugin/code-no-native-private.ts @@ -0,0 +1,33 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as eslint from 'eslint'; + +export = new class ApiProviderNaming implements eslint.Rule.RuleModule { + + readonly meta: eslint.Rule.RuleMetaData = { + messages: { + slow: 'Native private fields are much slower and should only be used when needed. Ignore this warning if you know what you are doing, use compile-time private otherwise. See https://github.com/microsoft/vscode/issues/185991#issuecomment-1614468158 for details', + } + }; + + create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener { + + return { + ['PropertyDefinition PrivateIdentifier']: (node: any) => { + context.report({ + node, + messageId: 'slow' + }); + }, + ['MethodDefinition PrivateIdentifier']: (node: any) => { + context.report({ + node, + messageId: 'slow' + }); + } + }; + } +}; diff --git a/.eslintplugin/code-no-test-async-suite.ts b/.eslintplugin/code-no-test-async-suite.ts new file mode 100644 index 00000000000..41d15d28636 --- /dev/null +++ b/.eslintplugin/code-no-test-async-suite.ts @@ -0,0 +1,33 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { TSESTree } from '@typescript-eslint/experimental-utils'; +import * as eslint from 'eslint'; + +function isCallExpression(node: TSESTree.Node): node is TSESTree.CallExpression { + return node.type === 'CallExpression'; +} + +function isFunctionExpression(node: TSESTree.Node): node is TSESTree.FunctionExpression { + return node.type.includes('FunctionExpression'); +} + +export = new class NoAsyncSuite implements eslint.Rule.RuleModule { + + create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener { + function hasAsyncSuite(node: any) { + if (isCallExpression(node) && node.arguments.length >= 2 && isFunctionExpression(node.arguments[1]) && node.arguments[1].async) { + return context.report({ + node: node as any, + message: 'suite factory function should never be async' + }); + } + } + + return { + ['CallExpression[callee.name=/suite$/][arguments]']: hasAsyncSuite, + }; + } +}; diff --git a/.eslintrc.json b/.eslintrc.json index 7e6b386b804..9e8e0cffe62 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -69,6 +69,7 @@ } ], "local/code-translation-remind": "warn", + "local/code-no-native-private": "warn", "local/code-no-nls-in-standalone-editor": "warn", "local/code-no-standalone-editor": "warn", "local/code-no-unexternalized-strings": "warn", @@ -119,6 +120,7 @@ ], "rules": { "local/code-no-test-only": "error", + "local/code-no-test-async-suite": "warn", "local/code-no-unexternalized-strings": "off" } }, @@ -193,6 +195,14 @@ ] } }, + { + "files": [ + "src/**/{common,browser}/**/*.ts" + ], + "rules": { + "local/code-amd-node-module": "warn" + } + }, { "files": [ "src/**/*.ts" @@ -233,6 +243,7 @@ "electron", "events", "fs", + "fs/promises", "graceful-fs", "http", "https", @@ -244,6 +255,7 @@ "os", "path", "perf_hooks", + "readline", "stream", "string_decoder", "tas-client-umd", @@ -593,6 +605,12 @@ "vs/workbench/workbench.common.main" ] }, + { + "target": "src/vs/amdX.ts", + "restrictions": [ + "vs/base/common/*" + ] + }, { "target": "src/vs/workbench/{workbench.desktop.main.nls.js,workbench.web.main.nls.js}", "restrictions": [] diff --git a/.github/classifier.json b/.github/classifier.json index 388a50d8db9..6710c3304da 100644 --- a/.github/classifier.json +++ b/.github/classifier.json @@ -281,7 +281,6 @@ "workbench-editor-resolver": {"assign": ["lramos15"]}, "workbench-editors": {"assign": ["bpasero"]}, "workbench-electron": {"assign": ["deepak1556"]}, - "workbench-feedback": {"assign": ["bpasero"]}, "workbench-fonts": {"assign": []}, "workbench-history": {"assign": ["bpasero"]}, "workbench-hot-exit": {"assign": ["bpasero"]}, diff --git a/.github/commands.json b/.github/commands.json index 417fdbd6068..15c6cd953c5 100644 --- a/.github/commands.json +++ b/.github/commands.json @@ -209,6 +209,14 @@ "removeLabel": "~version-info-needed", "comment": "Thanks for creating this issue! We figured it's missing some basic information, such as a version number, or in some other way doesn't follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). Please take the time to review these and update the issue.\n\nHappy Coding!" }, + { + "type": "label", + "name": "~confirmation-needed", + "action": "updateLabels", + "addLabel": "info-needed", + "removeLabel": "~confirmation-needed", + "comment": "Please diagnose the root cause of the issue by running the command `F1 > Help: Troubleshoot Issue` and following the instructions. Once you have done that, please update the issue with the results.\n\nHappy Coding!" + }, { "type": "comment", "name": "a11ymas", @@ -467,6 +475,19 @@ "addLabel": "info-needed", "comment": "Thanks for reporting this issue! Unfortunately, it's hard for us to understand what issue you're seeing. Please help us out by providing a screen recording showing exactly what isn't working as expected. While we can work with most standard formats, `.gif` files are preferred as they are displayed inline on GitHub. You may find https://gifcap.dev helpful as a browser-based gif recording tool.\n\nIf the issue depends on keyboard input, you can help us by enabling screencast mode for the recording (`Developer: Toggle Screencast Mode` in the command palette). Lastly, please attach this file via the GitHub web interface as emailed responses will strip files out from the issue.\n\nHappy coding!" }, + { + "type": "comment", + "name": "confirmPlease", + "allowUsers": [ + "cleidigh", + "usernamehw", + "gjsjohnmurray", + "IllusionMH" + ], + "action": "comment", + "addLabel": "info-needed", + "comment": "Please perform the following **three tasks** to diagnose the root cause of the issue:\n\n* [ ] **1.) Disable Extensions**\n * Select `View` and pick `Command Palette...`\n * Run `Developer: Reload With Extensions Disabled`\n * šŸ‘‰ See if the issue reproduces\n\n* [ ] **2.) Disable Configuration**\n * Select `View` and pick `Command Palette...`\n * Run `Profiles: Create a Temporary Profile`\n * šŸ‘‰ See if the issue reproduces\n\n* [ ] **3.) Try VS Code Insiders**\n * Download [VS Code Insiders](https://code.visualstudio.com/insiders/)\n * Install and Run it\n * šŸ‘‰ See if the issue reproduces\n \nThen pick one of the three resolutions depending on which step has helped:\n\n
\n Disabling my Extensions helped\n\nPlease run the command `Start Extension Bisect` and follow the instructions to find the extension that is causing this issue.\n\nimage\n\nPlease report the issue to the extension causing this.\n
\n\n
\n Disabling my configuration helped\nPlease report back more details about your configuration, including settings.\n
\n\n
\n Using VS Code Insiders has helped\nāœ… This likely means that the issue has been addressed already and will be available in an upcoming release. You can safely use VS Code Insiders until the new stable version is available.\n
" + }, { "__comment__": "Allows folks on the team to label issues by commenting: `\\label My-Label` ", "type": "comment", diff --git a/.github/commands/codespaces_issue.yml b/.github/commands/codespaces_issue.yml new file mode 100644 index 00000000000..7abacafaf21 --- /dev/null +++ b/.github/commands/codespaces_issue.yml @@ -0,0 +1,11 @@ +# Learn more about the syntax here: +# https://docs.github.com/en/early-access/github/save-time-with-slash-commands/syntax-for-user-defined-slash-commands +--- +trigger: codespaces_issue +title: Codespaces Issue +description: Report downstream + +steps: + - type: fill + template: |- + This looks like an issue with the Codespaces service which we don't track in this repository. You can report this to the Codespaces team at https://github.com/orgs/community/discussions/categories/codespaces diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dac5f9e073b..8a4d93dfa77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,7 @@ jobs: - name: Setup Build Environment run: | sudo apt-get update - sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1 + sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libkrb5-dev libxss1 dbus xvfb libgtk-3-0 libgbm1 sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb sudo chmod +x /etc/init.d/xvfb sudo update-rc.d xvfb defaults diff --git a/.github/workflows/deep-classifier-runner.yml b/.github/workflows/deep-classifier-runner.yml index c951476c083..2d90770bd25 100644 --- a/.github/workflows/deep-classifier-runner.yml +++ b/.github/workflows/deep-classifier-runner.yml @@ -47,6 +47,8 @@ jobs: with: configPath: classifier allowLabels: "info-needed|new release|error-telemetry|*english-please|translation-required" - appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}} - manifestDbConnectionString: ${{secrets.MANIFEST_DB_CONNECTION_STRING}} + tenantId: ${{secrets.TOOLS_TENANT_ID}} + clientId: ${{secrets.TOOLS_CLIENT_ID}} + clientSecret: ${{secrets.TOOLS_CLIENT_SECRET}} + clientScope: ${{secrets.TOOLS_CLIENT_SCOPE}} token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}} diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml index a86f94bc331..46ece33df5c 100644 --- a/.github/workflows/monaco-editor.yml +++ b/.github/workflows/monaco-editor.yml @@ -45,6 +45,9 @@ jobs: path: ${{ steps.yarnCacheDirPath.outputs.dir }} key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }} restore-keys: ${{ runner.os }}-yarnCacheDir- + - name: Install libkrb5-dev + if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} + run: sudo apt install -y libkrb5-dev - name: Execute yarn if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} env: diff --git a/.github/workflows/no-yarn-lock-changes.yml b/.github/workflows/no-yarn-lock-changes.yml index 5a90e5848fe..57082a28b1c 100644 --- a/.github/workflows/no-yarn-lock-changes.yml +++ b/.github/workflows/no-yarn-lock-changes.yml @@ -19,13 +19,13 @@ jobs: echo "user: ${{ github.event.pull_request.user.login }}" echo "role: ${{ fromJson(steps.get_permissions.outputs.data).permission }}" echo "is dependabot: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}" - echo "should_run: ${{ !contains(fromJson('["admin", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}" - echo "should_run=${{ !contains(fromJson('["admin", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) && github.event.pull_request.user.login != 'dependabot[bot]' }}" >> $GITHUB_OUTPUT + echo "should_run: ${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}" + echo "should_run=${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) && github.event.pull_request.user.login != 'dependabot[bot]' }}" >> $GITHUB_OUTPUT - name: Get file changes uses: trilom/file-changes-action@ce38c8ce2459ca3c303415eec8cb0409857b4272 if: ${{ steps.control.outputs.should_run == 'true' }} - - name: Check for yarn.lock changes + - name: Check for lockfile changes if: ${{ steps.control.outputs.should_run == 'true' }} run: | - cat $HOME/files.json | jq -e 'any(test("yarn\\.lock$")) | not' \ - || (echo "Changes to yarn.lock files aren't allowed in PRs." && exit 1) + cat $HOME/files.json | jq -e 'any(test("yarn\\.lock$|Cargo\\.lock$")) | not' \ + || (echo "Changes to yarn.lock/Cargo.lock files aren't allowed in PRs." && exit 1) diff --git a/.github/workflows/rich-navigation.yml b/.github/workflows/rich-navigation.yml.off similarity index 100% rename from .github/workflows/rich-navigation.yml rename to .github/workflows/rich-navigation.yml.off diff --git a/.gitignore b/.gitignore index 4306e9589e8..32f514ad07a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ vscode.lsif vscode.db /.profile-oss /cli/target +/cli/openssl product.overrides.json diff --git a/.vscode/launch.json b/.vscode/launch.json index afffde5ee6b..baa3cfb0c8b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -242,6 +242,7 @@ "--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes", // for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910 "--disable-features=CalculateNativeWinOcclusion", + "--disable-extension=vscode.vscode-api-tests" ], "webRoot": "${workspaceFolder}", "cascadeTerminateToConfigurations": [ diff --git a/.vscode/notebooks/api.github-issues b/.vscode/notebooks/api.github-issues index b32c51eaaec..706cb4d5d38 100644 --- a/.vscode/notebooks/api.github-issues +++ b/.vscode/notebooks/api.github-issues @@ -7,7 +7,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"May 2023\"" + "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"August 2023\"" }, { "kind": 1, diff --git a/.vscode/notebooks/endgame.github-issues b/.vscode/notebooks/endgame.github-issues index 64658b950f2..842fe282f17 100644 --- a/.vscode/notebooks/endgame.github-issues +++ b/.vscode/notebooks/endgame.github-issues @@ -7,7 +7,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"May 2023\"" + "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"August 2023\"" }, { "kind": 1, diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues index 33d23786e67..d41c81d839e 100644 --- a/.vscode/notebooks/my-endgame.github-issues +++ b/.vscode/notebooks/my-endgame.github-issues @@ -7,7 +7,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"May 2023\"\n\n$MINE=assignee:@me" + "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"August 2023\"\n\n$MINE=assignee:@me" }, { "kind": 1, @@ -157,7 +157,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:gregvanl -author:hediet -author:isidorn -author:joaomoreno -author:joyceerhl -author:jrieken -author:karrtikr -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25" + "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:gregvanl -author:hediet -author:isidorn -author:joaomoreno -author:joyceerhl -author:jrieken -author:karrtikr -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar" }, { "kind": 1, diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues index 320c5878bc8..06efd345018 100644 --- a/.vscode/notebooks/my-work.github-issues +++ b/.vscode/notebooks/my-work.github-issues @@ -7,7 +7,7 @@ { "kind": 2, "language": "github-issues", - "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-markdown-languageservice\n\n// current milestone name\n$milestone=milestone:\"May 2023\"" + "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release\n\n// current milestone name\n$milestone=milestone:\"August 2023\"" }, { "kind": 1, @@ -102,7 +102,7 @@ { "kind": 2, "language": "github-issues", - "value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:cloud-changes -label:code-lens -label:color-palette -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:htmlfs -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:ipc -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-keybinding -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-math -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-serverless-web -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remote-tunnel -label:rename -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:sync-error-handling -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-search -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:tips-and-tricks -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:untitled-editor-hint -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-feedback -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom" + "value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:cloud-changes -label:code-lens -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keybindings-json -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-math -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-serverless-web -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:inline-chat" }, { "kind": 1, diff --git a/.vscode/notebooks/verification.github-issues b/.vscode/notebooks/verification.github-issues index 15cf60b17dd..1b81dcd0148 100644 --- a/.vscode/notebooks/verification.github-issues +++ b/.vscode/notebooks/verification.github-issues @@ -2,7 +2,7 @@ { "kind": 1, "language": "markdown", - "value": "### Bug Verification Queries\r\n\r\nBefore shipping we want to verify _all_ bugs. That means when a bug is fixed we check that the fix actually works. It's always best to start with bugs that you have filed and the proceed with bugs that have been filed from users outside the development team. " + "value": "### Bug Verification Queries\n\nBefore shipping we want to verify _all_ bugs. That means when a bug is fixed we check that the fix actually works. It's always best to start with bugs that you have filed and the proceed with bugs that have been filed from users outside the development team. " }, { "kind": 1, @@ -12,7 +12,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n$milestone=milestone:\"February 2023\"" + "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n$milestone=milestone:\"August 2023\"" }, { "kind": 1, @@ -32,7 +32,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos $milestone is:closed reason:completed -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand -author:rzhao271 -author:kieferrm -author:TylerLeonhardt -author:bamurtaugh -author:hediet -author:joyceerhl -author:rchiodo" + "value": "$repos $milestone is:closed reason:completed -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand -author:rzhao271 -author:kieferrm -author:TylerLeonhardt -author:bamurtaugh -author:hediet -author:joyceerhl -author:rchiodo" }, { "kind": 1, diff --git a/.vscode/notebooks/vscode-dev.github-issues b/.vscode/notebooks/vscode-dev.github-issues index 9266fd7654c..013c3331dca 100644 --- a/.vscode/notebooks/vscode-dev.github-issues +++ b/.vscode/notebooks/vscode-dev.github-issues @@ -1,4 +1,9 @@ [ + { + "kind": 2, + "language": "github-issues", + "value": "$milestone=milestone:\"August 2023\"" + }, { "kind": 1, "language": "markdown", @@ -7,7 +12,7 @@ { "kind": 2, "language": "github-issues", - "value": "repo:microsoft/vscode-dev milestone:\"May 2022\" is:open" + "value": "repo:microsoft/vscode-dev $milestone is:open" }, { "kind": 2, @@ -32,11 +37,11 @@ { "kind": 2, "language": "github-issues", - "value": "repo:microsoft/vscode-remote-repositories-github milestone:\"May 2022\" is:open" + "value": "repo:microsoft/vscode-remote-repositories-github $milestone is:open" }, { "kind": 2, "language": "github-issues", - "value": "repo:microsoft/vscode-remotehub milestone:\"May 2022\" is:open" + "value": "repo:microsoft/vscode-remotehub $milestone is:open" } ] \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index ed15f8b6c69..7eefe0c57f6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -35,6 +35,13 @@ }, "files.readonlyInclude": { "**/node_modules/**": true, + "**/yarn.lock": true, + "**/Cargo.lock": true, + "src/vs/workbench/workbench.web.main.css": true, + "src/vs/workbench/workbench.desktop.main.css": true, + "src/vs/workbench/workbench.desktop.main.nls.js": true, + "src/vs/workbench/workbench.web.main.nls.js": true, + "build/**/*.js": true, "out/**": true, "out-build/**": true, "out-vscode/**": true, @@ -45,6 +52,12 @@ "test/automation/out/**": true, "test/integration/browser/out/**": true, }, + "files.readonlyExclude": { + "build/builtin/*.js": true, + "build/monaco/*.js": true, + "build/npm/*.js": true, + "build/*.js": true + }, "lcov.path": [ "./.build/coverage/lcov.info", "./.build/coverage-single/lcov.info" @@ -123,6 +136,7 @@ "git", "sash" ], + "githubPullRequests.experimental.createView": true, "debug.javascript.terminalOptions": { "outFiles": [ "${workspaceFolder}/out/**/*.js", @@ -136,5 +150,6 @@ ], "application.experimental.rendererProfiling": true, "editor.experimental.asyncTokenization": true, - "editor.experimental.asyncTokenizationVerification": true + "editor.experimental.asyncTokenizationVerification": true, + "diffEditor.experimental.useVersion2": true, } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 1a6554bec65..666edb3fb2c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -112,6 +112,17 @@ "dependsOrder": "sequence", "problemMatcher": [] }, + { + "label": "Kill VS Code - Build, Yarn, VS Code - Build", + "dependsOn": [ + "Kill VS Code - Build", + "npm: install", + "VS Code - Build" + ], + "group": "build", + "dependsOrder": "sequence", + "problemMatcher": [] + }, { "type": "npm", "script": "watch-webd", diff --git a/.yarnrc b/.yarnrc index f9cdb2b50f9..389a2bd709c 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,4 +1,5 @@ disturl "https://electronjs.org/headers" -target "22.3.5" +target "22.3.18" +ms_build_id "22689846" runtime "electron" build_from_source "true" diff --git a/CodeQL.yml b/CodeQL.yml new file mode 100644 index 00000000000..eecb813a96f --- /dev/null +++ b/CodeQL.yml @@ -0,0 +1,29 @@ +path_classifiers: + test: + # Classify all files in the top-level directories test/ and testsuites/ as test code. + - test + # Classify all files with suffix `.test` as test code. + # Note: use only forward slash / as a path separator. + # * Matches any sequence of characters except a forward slash. + # ** Matches any sequence of characters, including a forward slash. + # This wildcard must either be surrounded by forward slash symbols, or used as the first segment of a path. + # It matches zero or more whole directory segments. There is no need to use a wildcard at the end of a directory path because all sub-directories are automatically matched. + # That is, /anything/ matches the anything directory and all its subdirectories. + # Always enclose the expression in double quotes if it includes *. + - "**/*.test.ts" + + # The default behavior is to tag all files created during the + # build as `generated`. Results are hidden for generated code. You can tag + # further files as being generated by adding them to the `generated` section. + generated: + # generated code. + - out + - "out-build" + - "out-vscode" + - "**/out/**" + + # The default behavior is to tag library code as `library`. Results are hidden + # for library code. You can tag further files as being library code by adding them + # to the `library` section. + library: + - "**/node_modules/**" diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 053d76c7c06..cf52ca35c94 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -169,45 +169,6 @@ OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------- -atom/language-java 0.32.1 - MIT -https://github.com/atom/language-java - -The MIT License (MIT) - -Copyright (c) 2014 GitHub Inc. - -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. - - -This package was derived from a TextMate bundle located at -https://github.com/textmate/java.tmbundle and distributed under the following -license, located in `README.mdown`: - -Permission to copy, use, modify, sell and distribute this -software is granted. This software is provided "as is" without -express or implied warranty, and with no claim as to its -suitability for any purpose. ---------------------------------------------------------- - ---------------------------------------------------------- - atom/language-sass 0.62.1 - MIT https://github.com/atom/language-sass @@ -493,17 +454,207 @@ b) the Mozilla Public License Version 2.0 ----------------------------------------------------------------------------- -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ - http://www.apache.org/licenses/LICENSE-2.0 + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. ----------------------------------------------------------------------------- Mozilla Public License, version 2.0 @@ -1275,7 +1426,7 @@ SOFTWARE. --------------------------------------------------------- -jeff-hykin/better-shell-syntax 1.5.4 - MIT +jeff-hykin/better-shell-syntax 1.6.2 - MIT https://github.com/jeff-hykin/better-shell-syntax MIT License @@ -1303,7 +1454,7 @@ SOFTWARE. --------------------------------------------------------- -jlelong/vscode-latex-basics 1.5.1 - MIT +jlelong/vscode-latex-basics 1.5.3 - MIT https://github.com/jlelong/vscode-latex-basics Copyright (c) vscode-latex-basics authors @@ -1654,8 +1805,8 @@ THE SOFTWARE. --------------------------------------------------------- -language-php 0.48.1 - MIT -https://github.com/atom/language-php +language-php 0.49.0 - MIT +https://github.com/KapitanOczywisty/language-php The MIT License (MIT) @@ -1772,389 +1923,6 @@ This software is provided by the copyright holders and contributors "as is" and --------------------------------------------------------- -mdn-data 1.1.12 - MPL -https://github.com/mdn/data - -Mozilla Public License Version 2.0 - -Copyright (c) 2018 Mozilla Corporation - -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. ---------------------------------------------------------- - ---------------------------------------------------------- - microsoft/TypeScript-TmLanguage 0.0.1 - MIT https://github.com/microsoft/TypeScript-TmLanguage @@ -2184,7 +1952,7 @@ THE SOFTWARE. --------------------------------------------------------- -microsoft/vscode-css 0.45.1 - MIT License +microsoft/vscode-css 0.0.0 - MIT License https://github.com/microsoft/vscode-css MIT License @@ -2278,7 +2046,7 @@ SOFTWARE. --------------------------------------------------------- -microsoft/vscode-mssql 1.19.0 - MIT +microsoft/vscode-mssql 1.20.0 - MIT https://github.com/microsoft/vscode-mssql ------------------------------------------ START OF LICENSE ----------------------------------------- @@ -2369,6 +2137,46 @@ SOFTWARE. --------------------------------------------------------- +redhat-developer/vscode-java 1.21.0 - MIT +https://github.com/redhat-developer/vscode-java + +The MIT License (MIT) + +Copyright (c) 2014 GitHub Inc. + +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. + +-------------------------------------------------------------------- + +This package was derived from a TextMate bundle located at +https://github.com/textmate/java.tmbundle and distributed under the following +license, located in `README.mdown`: + +Permission to copy, use, modify, sell and distribute this +software is granted. This software is provided "as is" without +express or implied warranty, and with no claim as to its +suitability for any purpose. +--------------------------------------------------------- + +--------------------------------------------------------- + rust-syntax 0.5.0 - MIT https://github.com/dustypomerleau/rust-syntax @@ -2748,7 +2556,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SO --------------------------------------------------------- -trond-snekvik/vscode-rst 1.5.1 - MIT +trond-snekvik/vscode-rst 1.5.2 - MIT https://github.com/trond-snekvik/vscode-rst The MIT License (MIT) diff --git a/build/.cachesalt b/build/.cachesalt index e41ee49d6db..26ad5de2bca 100644 --- a/build/.cachesalt +++ b/build/.cachesalt @@ -1 +1 @@ -2023-03-31T12:39:03.753Z +2023-07-20T13:31:34.746Z diff --git a/build/.moduleignore b/build/.moduleignore index 56e2fb15718..e4a19bbb762 100644 --- a/build/.moduleignore +++ b/build/.moduleignore @@ -37,6 +37,8 @@ fsevents/test/** @vscode/windows-process-tree/binding.gyp @vscode/windows-process-tree/build/** @vscode/windows-process-tree/src/** +@vscode/windows-process-tree/tsconfig.json +@vscode/windows-process-tree/tslint.json !@vscode/windows-process-tree/**/*.node @vscode/windows-registry/binding.gyp @@ -71,6 +73,12 @@ windows-foreground-love/build/** windows-foreground-love/src/** !windows-foreground-love/**/*.node +kerberos/binding.gyp +kerberos/build/** +kerberos/src/** +kerberos/node_modules/** +!kerberos/**/*.node + keytar/binding.gyp keytar/build/** keytar/src/** @@ -106,14 +114,6 @@ vsda/SECURITY.md vsda/targets !vsda/build/Release/vsda.node -vscode-encrypt/build/** -vscode-encrypt/src/** -vscode-encrypt/vendor/** -vscode-encrypt/.gitignore -vscode-encrypt/binding.gyp -vscode-encrypt/README.md -!vscode-encrypt/build/Release/vscode-encrypt-native.node - @vscode/policy-watcher/build/** @vscode/policy-watcher/.husky/** @vscode/policy-watcher/src/** diff --git a/build/.moduleignore.darwin b/build/.moduleignore.darwin new file mode 100644 index 00000000000..dbc12762f7d --- /dev/null +++ b/build/.moduleignore.darwin @@ -0,0 +1,17 @@ +@vscode/windows-mutex/index.js +@vscode/windows-mutex/**/*.node +@vscode/windows-mutex/*.md +@vscode/windows-mutex/package.json + +@vscode/windows-process-tree/lib/** +@vscode/windows-process-tree/**/*.node +@vscode/windows-process-tree/LICENSE +@vscode/windows-process-tree/package.json +@vscode/windows-process-tree/*.md + +@vscode/windows-registry/dist/** +@vscode/windows-registry/**/*.node +@vscode/windows-registry/*.md +@vscode/windows-registry/*.txt +@vscode/windows-registry/package.json +!@vscode/windows-registry/dist/index.d.ts \ No newline at end of file diff --git a/build/.moduleignore.linux b/build/.moduleignore.linux new file mode 100644 index 00000000000..dbc12762f7d --- /dev/null +++ b/build/.moduleignore.linux @@ -0,0 +1,17 @@ +@vscode/windows-mutex/index.js +@vscode/windows-mutex/**/*.node +@vscode/windows-mutex/*.md +@vscode/windows-mutex/package.json + +@vscode/windows-process-tree/lib/** +@vscode/windows-process-tree/**/*.node +@vscode/windows-process-tree/LICENSE +@vscode/windows-process-tree/package.json +@vscode/windows-process-tree/*.md + +@vscode/windows-registry/dist/** +@vscode/windows-registry/**/*.node +@vscode/windows-registry/*.md +@vscode/windows-registry/*.txt +@vscode/windows-registry/package.json +!@vscode/windows-registry/dist/index.d.ts \ No newline at end of file diff --git a/build/.moduleignore.win32 b/build/.moduleignore.win32 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/build/.webignore b/build/.webignore index 37154964b80..bc8fe659566 100644 --- a/build/.webignore +++ b/build/.webignore @@ -49,6 +49,5 @@ xterm-addon-webgl/out/** !@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js.min.js !@microsoft/applicationinsights-shims/dist/umd/applicationinsights-shims.min.js - - - +vsda/** +!vsda/rust/web/** diff --git a/build/azure-pipelines/alpine/cli-build-alpine.yml b/build/azure-pipelines/alpine/cli-build-alpine.yml index 1877b342ae0..8aa191023da 100644 --- a/build/azure-pipelines/alpine/cli-build-alpine.yml +++ b/build/azure-pipelines/alpine/cli-build-alpine.yml @@ -15,14 +15,29 @@ steps: - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - template: ../distro/download-distro.yml - - script: node build/azure-pipelines/distro/apply-cli-patches + + # Install yarn as the ARM64 build agent is using vanilla Ubuntu + - ${{ if eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true) }}: + - task: Npm@1 + displayName: Install yarn + inputs: + command: custom + customCommand: install --global yarn + + - script: | + set -e + yarn --frozen-lockfile --ignore-optional + workingDirectory: build + displayName: Install pipeline build + + - script: node .build/distro/cli-patches/index.js displayName: Apply distro patches - task: Npm@1 displayName: Download openssl prebuilt inputs: command: custom - customCommand: pack @vscode-internal/openssl-prebuilt@0.0.5 + customCommand: pack @vscode-internal/openssl-prebuilt@0.0.8 customRegistry: useFeed customFeed: "Monaco/openssl-prebuilt" workingDir: $(Build.ArtifactStagingDirectory) @@ -30,7 +45,7 @@ steps: - script: | set -e mkdir $(Build.ArtifactStagingDirectory)/openssl - tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl + tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.8.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl displayName: Extract openssl prebuilt # inspired by: https://github.com/emk/rust-musl-builder/blob/main/Dockerfile diff --git a/build/azure-pipelines/alpine/product-build-alpine.yml b/build/azure-pipelines/alpine/product-build-alpine.yml index c3dae009184..44af6a76985 100644 --- a/build/azure-pipelines/alpine/product-build-alpine.yml +++ b/build/azure-pipelines/alpine/product-build-alpine.yml @@ -3,10 +3,6 @@ steps: inputs: versionSpec: "16.x" - - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - displayName: "Register Docker QEMU" - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) - - template: ../distro/download-distro.yml - task: AzureKeyVault@1 @@ -67,6 +63,10 @@ steps: displayName: "Pull image" condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - script: sudo apt-get update && sudo apt-get install -y libkrb5-dev + displayName: Install build dependencies + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - script: | set -e for i in {1..5}; do # try 5 times @@ -78,10 +78,12 @@ steps: echo "Yarn failed $i, trying again..." done env: + npm_config_arch: $(NPM_ARCH) ELECTRON_SKIP_BINARY_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 GITHUB_TOKEN: "$(github-distro-mixin-password)" VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME: vscodehub.azurecr.io/vscode-linux-build-agent:alpine-$(VSCODE_ARCH) + VSCODE_HOST_MOUNT: "/mnt/vss/_work/1/s" displayName: Install build dependencies condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) @@ -104,53 +106,51 @@ steps: - script: | set -e - TARGET=$([ "$VSCODE_ARCH" == "x64" ] && echo "linux-alpine" || echo "alpine-arm64") + TARGET=$([ "$VSCODE_ARCH" == "x64" ] && echo "linux-alpine" || echo "alpine-arm64") # TODO@joaomoreno yarn gulp vscode-reh-$TARGET-min-ci - yarn gulp vscode-reh-web-$TARGET-min-ci - displayName: Build + (cd .. && mv vscode-reh-$TARGET vscode-server-$TARGET) # TODO@joaomoreno + ARCHIVE_PATH=".build/linux/server/vscode-server-$TARGET.tar.gz" + mkdir -p $(dirname $ARCHIVE_PATH) + tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-server-$TARGET + echo "##vso[task.setvariable variable=SERVER_PATH]$ARCHIVE_PATH" + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Build server - script: | set -e TARGET=$([ "$VSCODE_ARCH" == "x64" ] && echo "linux-alpine" || echo "alpine-arm64") - REPO="$(pwd)" - ROOT="$REPO/.." + yarn gulp vscode-reh-web-$TARGET-min-ci + (cd .. && mv vscode-reh-web-$TARGET vscode-server-$TARGET-web) # TODO@joaomoreno + ARCHIVE_PATH=".build/linux/web/vscode-server-$TARGET-web.tar.gz" + mkdir -p $(dirname $ARCHIVE_PATH) + tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-server-$TARGET-web + echo "##vso[task.setvariable variable=WEB_PATH]$ARCHIVE_PATH" + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Build server (web) - # Publish Remote Extension Host - LEGACY_SERVER_BUILD_NAME="vscode-reh-$TARGET" - SERVER_BUILD_NAME="vscode-server-$TARGET" - SERVER_TARBALL_FILENAME="vscode-server-$TARGET.tar.gz" - SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME" + - script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_" + condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')) + displayName: Generate artifact prefix - rm -rf $ROOT/vscode-server-*.tar.* - (cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME) - - # Publish Remote Extension Host (Web) - LEGACY_SERVER_BUILD_NAME="vscode-reh-web-$TARGET" - SERVER_BUILD_NAME="vscode-server-$TARGET-web" - SERVER_TARBALL_FILENAME="vscode-server-$TARGET-web.tar.gz" - SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME" - - rm -rf $ROOT/vscode-server-*-web.tar.* - (cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME) - displayName: Prepare for publish - - - publish: $(Agent.BuildDirectory)/vscode-server-alpine-$(VSCODE_ARCH).tar.gz - artifact: vscode_server_alpine_$(VSCODE_ARCH)_archive-unsigned + - publish: $(SERVER_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_server_alpine_$(VSCODE_ARCH)_archive-unsigned displayName: Publish server archive - condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'x64')) + condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), ne(variables['VSCODE_ARCH'], 'x64')) - - publish: $(Agent.BuildDirectory)/vscode-server-alpine-$(VSCODE_ARCH)-web.tar.gz - artifact: vscode_web_alpine_$(VSCODE_ARCH)_archive-unsigned + - publish: $(WEB_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_web_alpine_$(VSCODE_ARCH)_archive-unsigned displayName: Publish web server archive - condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'x64')) + condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), ne(variables['VSCODE_ARCH'], 'x64')) # Legacy x64 artifact name - - publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine.tar.gz - artifact: vscode_server_linux_alpine_archive-unsigned + - publish: $(SERVER_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_server_linux_alpine_archive-unsigned displayName: Publish x64 server archive - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) + condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), eq(variables['VSCODE_ARCH'], 'x64')) - - publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine-web.tar.gz - artifact: vscode_web_linux_alpine_archive-unsigned + - publish: $(WEB_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_web_linux_alpine_archive-unsigned displayName: Publish x64 web server archive - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) + condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), eq(variables['VSCODE_ARCH'], 'x64')) diff --git a/build/azure-pipelines/cli/cli-apply-patches.yml b/build/azure-pipelines/cli/cli-apply-patches.yml new file mode 100644 index 00000000000..35b429375c0 --- /dev/null +++ b/build/azure-pipelines/cli/cli-apply-patches.yml @@ -0,0 +1,5 @@ +steps: + - template: ../distro/download-distro.yml + + - script: node .build/distro/cli-patches/index.js + displayName: Apply distro patches diff --git a/build/azure-pipelines/cli/cli-compile-and-publish.yml b/build/azure-pipelines/cli/cli-compile-and-publish.yml index 5025994f3a2..a6468ad3ae9 100644 --- a/build/azure-pipelines/cli/cli-compile-and-publish.yml +++ b/build/azure-pipelines/cli/cli-compile-and-publish.yml @@ -6,42 +6,38 @@ parameters: - name: VSCODE_CLI_ENV type: object default: {} + - name: VSCODE_CHECK_ONLY + type: boolean + default: false steps: - - script: cargo build --release --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code - displayName: Compile ${{ parameters.VSCODE_CLI_TARGET }} - workingDirectory: $(Build.SourcesDirectory)/cli - env: - CARGO_NET_GIT_FETCH_WITH_CLI: true - ${{ each pair in parameters.VSCODE_CLI_ENV }}: - ${{ pair.key }}: ${{ pair.value }} - - - ${{ if contains(parameters.VSCODE_CLI_TARGET, '-windows-') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - Move-Item -Path $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code.exe -Destination "$(Build.ArtifactStagingDirectory)/${env:VSCODE_CLI_APPLICATION_NAME}.exe" - - - task: ArchiveFiles@2 - inputs: - rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME).exe - includeRootFolder: false - archiveType: zip - archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip - - - publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip - artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }} - displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact + - ${{ if parameters.VSCODE_CHECK_ONLY }}: + - script: rustup component add clippy && cargo clippy --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code + displayName: Lint ${{ parameters.VSCODE_CLI_TARGET }} + workingDirectory: $(Build.SourcesDirectory)/cli + env: + CARGO_NET_GIT_FETCH_WITH_CLI: true + ${{ each pair in parameters.VSCODE_CLI_ENV }}: + ${{ pair.key }}: ${{ pair.value }} - ${{ else }}: - - script: | - set -e - mv $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME) + - script: cargo build --release --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code + displayName: Compile ${{ parameters.VSCODE_CLI_TARGET }} + workingDirectory: $(Build.SourcesDirectory)/cli + env: + CARGO_NET_GIT_FETCH_WITH_CLI: true + ${{ each pair in parameters.VSCODE_CLI_ENV }}: + ${{ pair.key }}: ${{ pair.value }} + + - ${{ if contains(parameters.VSCODE_CLI_TARGET, '-windows-') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + Move-Item -Path $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code.exe -Destination "$(Build.ArtifactStagingDirectory)/${env:VSCODE_CLI_APPLICATION_NAME}.exe" - - ${{ if contains(parameters.VSCODE_CLI_TARGET, '-darwin') }}: - task: ArchiveFiles@2 inputs: - rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME) + rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME).exe includeRootFolder: false archiveType: zip archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip @@ -51,14 +47,31 @@ steps: displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact - ${{ else }}: - - task: ArchiveFiles@2 - inputs: - rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME) - includeRootFolder: false - archiveType: tar - tarCompression: gz - archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz + - script: | + set -e + mv $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME) - - publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz - artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }} - displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact + - ${{ if contains(parameters.VSCODE_CLI_TARGET, '-darwin') }}: + - task: ArchiveFiles@2 + inputs: + rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME) + includeRootFolder: false + archiveType: zip + archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip + + - publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip + artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }} + displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact + + - ${{ else }}: + - task: ArchiveFiles@2 + inputs: + rootFolderOrFile: $(Build.ArtifactStagingDirectory)/$(VSCODE_CLI_APPLICATION_NAME) + includeRootFolder: false + archiveType: tar + tarCompression: gz + archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz + + - publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz + artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }} + displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact diff --git a/build/azure-pipelines/cli/install-rust-posix.yml b/build/azure-pipelines/cli/install-rust-posix.yml index ee1e26f3505..d6022a44f7a 100644 --- a/build/azure-pipelines/cli/install-rust-posix.yml +++ b/build/azure-pipelines/cli/install-rust-posix.yml @@ -1,7 +1,7 @@ parameters: - name: channel type: string - default: 1.65.0 + default: 1.71.0 - name: targets default: [] type: object diff --git a/build/azure-pipelines/cli/install-rust-win32.yml b/build/azure-pipelines/cli/install-rust-win32.yml index 62ff0ce4ec5..373c41dd95f 100644 --- a/build/azure-pipelines/cli/install-rust-win32.yml +++ b/build/azure-pipelines/cli/install-rust-win32.yml @@ -1,7 +1,7 @@ parameters: - name: channel type: string - default: 1.65.0 + default: 1.71.0 - name: targets default: [] type: object diff --git a/build/azure-pipelines/cli/prepare.js b/build/azure-pipelines/cli/prepare.js index 9531a33e2f2..bd11bc6a0a4 100644 --- a/build/azure-pipelines/cli/prepare.js +++ b/build/azure-pipelines/cli/prepare.js @@ -35,6 +35,7 @@ const makeQualityMap = (m) => { */ const setLauncherEnvironmentVars = () => { const vars = new Map([ + ['VSCODE_CLI_ALREADY_PREPARED', 'true'], ['VSCODE_CLI_REMOTE_LICENSE_TEXT', product.serverLicense?.join('\\n')], ['VSCODE_CLI_REMOTE_LICENSE_PROMPT', product.serverLicensePrompt], ['VSCODE_CLI_AI_KEY', product.aiConfig?.cliKey], @@ -89,4 +90,4 @@ const setLauncherEnvironmentVars = () => { if (require.main === module) { setLauncherEnvironmentVars(); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlcGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByZXBhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOztBQUVoRyxxREFBa0Q7QUFDbEQseUJBQXlCO0FBQ3pCLDZCQUE2QjtBQUM3QixxREFBcUQ7QUFFckQsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDeEcsTUFBTSxRQUFRLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztBQUU3RSxJQUFJLGVBQXVCLENBQUM7QUFDNUIsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEtBQUssS0FBSyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUM7QUFDbEYsSUFBSSxLQUFLLEVBQUU7SUFDVixlQUFlLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsY0FBYyxDQUFDLENBQUM7Q0FDbEQ7S0FBTTtJQUNOLGVBQWUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFlLEVBQUUsY0FBYyxDQUFDLENBQUM7Q0FDeEY7QUFFRCxPQUFPLENBQUMsS0FBSyxDQUFDLDJCQUEyQixFQUFFLGVBQWUsQ0FBQyxDQUFDO0FBQzVELE1BQU0sT0FBTyxHQUFHLFFBQVEsQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUMxQyxNQUFNLHVCQUF1QixHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQztLQUMxRixHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxjQUFjLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQ25HLE1BQU0sTUFBTSxHQUFHLElBQUEsdUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztBQUVoQyxNQUFNLGNBQWMsR0FBRyxDQUFJLENBQTJDLEVBQXFCLEVBQUU7SUFDNUYsTUFBTSxNQUFNLEdBQXNCLEVBQUUsQ0FBQztJQUNyQyxLQUFLLE1BQU0sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLElBQUksdUJBQXVCLEVBQUU7UUFDeEQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUM7S0FDbkM7SUFDRCxPQUFPLE1BQU0sQ0FBQztBQUNmLENBQUMsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSwwQkFBMEIsR0FBRyxHQUFHLEVBQUU7SUFDdkMsTUFBTSxJQUFJLEdBQUcsSUFBSSxHQUFHLENBQUM7UUFDcEIsQ0FBQyxnQ0FBZ0MsRUFBRSxPQUFPLENBQUMsYUFBYSxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN0RSxDQUFDLGtDQUFrQyxFQUFFLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQztRQUNqRSxDQUFDLG1CQUFtQixFQUFFLE9BQU8sQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDO1FBQy9DLENBQUMsd0JBQXdCLEVBQUUsT0FBTyxDQUFDLFFBQVEsRUFBRSxXQUFXLENBQUM7UUFDekQsQ0FBQyxvQkFBb0IsRUFBRSxXQUFXLENBQUMsT0FBTyxDQUFDO1FBQzNDLENBQUMsNEJBQTRCLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQztRQUNqRCxDQUFDLG9CQUFvQixFQUFFLE9BQU8sQ0FBQyxPQUFPLENBQUM7UUFDdkMsQ0FBQyx1QkFBdUIsRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDO1FBQzVDLENBQUMsc0JBQXNCLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQztRQUMxQyxDQUFDLHFDQUFxQyxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNwRixDQUFDLDhCQUE4QixFQUFFLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQztRQUMxRCxDQUFDLDZCQUE2QixFQUFFLE9BQU8sQ0FBQyxlQUFlLENBQUM7UUFDeEQsQ0FBQywyQkFBMkIsRUFBRSxPQUFPLENBQUMsdUJBQXVCLEVBQUUsWUFBWSxDQUFDO1FBQzVFLENBQUMsaUNBQWlDLEVBQUUsT0FBTyxDQUFDLHVCQUF1QixDQUFDO1FBQ3BFLENBQUMsNkJBQTZCLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixDQUFDO1FBQ3pELENBQUMsbUJBQW1CLEVBQUUsTUFBTSxDQUFDO1FBQzdCLENBQUMsb0NBQW9DLEVBQUUsT0FBTyxDQUFDLGNBQWMsQ0FBQztRQUM5RDtZQUNDLDBCQUEwQjtZQUMxQixDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsU0FBUyxDQUN2QixjQUFjLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQztpQkFDekMsTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2lCQUM3QyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FDekQ7U0FDRDtRQUNEO1lBQ0MsMEJBQTBCO1lBQzFCLENBQUMsS0FBSyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1NBQy9EO1FBQ0Q7WUFDQyxpQ0FBaUM7WUFDakMsQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7U0FDdEU7UUFDRDtZQUNDLDRCQUE0QjtZQUM1QixDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO1NBQzVFO1FBQ0Q7WUFDQyxrQ0FBa0M7WUFDbEMsQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7U0FDbEU7S0FDRCxDQUFDLENBQUM7SUFFSCxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLEtBQUssTUFBTSxFQUFFO1FBQ3JELE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQzlEO1NBQU07UUFDTixLQUFLLE1BQU0sQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLElBQUksSUFBSSxFQUFFO1lBQ2hDLElBQUksS0FBSyxFQUFFO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsbUNBQW1DLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQyxDQUFDO2FBQy9EO1NBQ0Q7S0FDRDtBQUVGLENBQUMsQ0FBQztBQUVGLElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxNQUFNLEVBQUU7SUFDNUIsMEJBQTBCLEVBQUUsQ0FBQztDQUM3QiJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlcGFyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByZXBhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOztBQUVoRyxxREFBa0Q7QUFDbEQseUJBQXlCO0FBQ3pCLDZCQUE2QjtBQUM3QixxREFBcUQ7QUFFckQsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDeEcsTUFBTSxRQUFRLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztBQUU3RSxJQUFJLGVBQXVCLENBQUM7QUFDNUIsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEtBQUssS0FBSyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUM7QUFDbEYsSUFBSSxLQUFLLEVBQUU7SUFDVixlQUFlLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsY0FBYyxDQUFDLENBQUM7Q0FDbEQ7S0FBTTtJQUNOLGVBQWUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFlLEVBQUUsY0FBYyxDQUFDLENBQUM7Q0FDeEY7QUFFRCxPQUFPLENBQUMsS0FBSyxDQUFDLDJCQUEyQixFQUFFLGVBQWUsQ0FBQyxDQUFDO0FBQzVELE1BQU0sT0FBTyxHQUFHLFFBQVEsQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUMxQyxNQUFNLHVCQUF1QixHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQztLQUMxRixHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxjQUFjLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQ25HLE1BQU0sTUFBTSxHQUFHLElBQUEsdUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztBQUVoQyxNQUFNLGNBQWMsR0FBRyxDQUFJLENBQTJDLEVBQXFCLEVBQUU7SUFDNUYsTUFBTSxNQUFNLEdBQXNCLEVBQUUsQ0FBQztJQUNyQyxLQUFLLE1BQU0sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLElBQUksdUJBQXVCLEVBQUU7UUFDeEQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUM7S0FDbkM7SUFDRCxPQUFPLE1BQU0sQ0FBQztBQUNmLENBQUMsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSwwQkFBMEIsR0FBRyxHQUFHLEVBQUU7SUFDdkMsTUFBTSxJQUFJLEdBQUcsSUFBSSxHQUFHLENBQUM7UUFDcEIsQ0FBQyw2QkFBNkIsRUFBRSxNQUFNLENBQUM7UUFDdkMsQ0FBQyxnQ0FBZ0MsRUFBRSxPQUFPLENBQUMsYUFBYSxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN0RSxDQUFDLGtDQUFrQyxFQUFFLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQztRQUNqRSxDQUFDLG1CQUFtQixFQUFFLE9BQU8sQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDO1FBQy9DLENBQUMsd0JBQXdCLEVBQUUsT0FBTyxDQUFDLFFBQVEsRUFBRSxXQUFXLENBQUM7UUFDekQsQ0FBQyxvQkFBb0IsRUFBRSxXQUFXLENBQUMsT0FBTyxDQUFDO1FBQzNDLENBQUMsNEJBQTRCLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQztRQUNqRCxDQUFDLG9CQUFvQixFQUFFLE9BQU8sQ0FBQyxPQUFPLENBQUM7UUFDdkMsQ0FBQyx1QkFBdUIsRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDO1FBQzVDLENBQUMsc0JBQXNCLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQztRQUMxQyxDQUFDLHFDQUFxQyxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNwRixDQUFDLDhCQUE4QixFQUFFLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQztRQUMxRCxDQUFDLDZCQUE2QixFQUFFLE9BQU8sQ0FBQyxlQUFlLENBQUM7UUFDeEQsQ0FBQywyQkFBMkIsRUFBRSxPQUFPLENBQUMsdUJBQXVCLEVBQUUsWUFBWSxDQUFDO1FBQzVFLENBQUMsaUNBQWlDLEVBQUUsT0FBTyxDQUFDLHVCQUF1QixDQUFDO1FBQ3BFLENBQUMsNkJBQTZCLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixDQUFDO1FBQ3pELENBQUMsbUJBQW1CLEVBQUUsTUFBTSxDQUFDO1FBQzdCLENBQUMsb0NBQW9DLEVBQUUsT0FBTyxDQUFDLGNBQWMsQ0FBQztRQUM5RDtZQUNDLDBCQUEwQjtZQUMxQixDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsU0FBUyxDQUN2QixjQUFjLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQztpQkFDekMsTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2lCQUM3QyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FDekQ7U0FDRDtRQUNEO1lBQ0MsMEJBQTBCO1lBQzFCLENBQUMsS0FBSyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1NBQy9EO1FBQ0Q7WUFDQyxpQ0FBaUM7WUFDakMsQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7U0FDdEU7UUFDRDtZQUNDLDRCQUE0QjtZQUM1QixDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO1NBQzVFO1FBQ0Q7WUFDQyxrQ0FBa0M7WUFDbEMsQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7U0FDbEU7S0FDRCxDQUFDLENBQUM7SUFFSCxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLEtBQUssTUFBTSxFQUFFO1FBQ3JELE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQzlEO1NBQU07UUFDTixLQUFLLE1BQU0sQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLElBQUksSUFBSSxFQUFFO1lBQ2hDLElBQUksS0FBSyxFQUFFO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsbUNBQW1DLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQyxDQUFDO2FBQy9EO1NBQ0Q7S0FDRDtBQUVGLENBQUMsQ0FBQztBQUVGLElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxNQUFNLEVBQUU7SUFDNUIsMEJBQTBCLEVBQUUsQ0FBQztDQUM3QiJ9 \ No newline at end of file diff --git a/build/azure-pipelines/cli/prepare.ts b/build/azure-pipelines/cli/prepare.ts index 3c40048cec5..7157dae3ecd 100644 --- a/build/azure-pipelines/cli/prepare.ts +++ b/build/azure-pipelines/cli/prepare.ts @@ -38,6 +38,7 @@ const makeQualityMap = (m: (productJson: any, quality: string) => T): Record< */ const setLauncherEnvironmentVars = () => { const vars = new Map([ + ['VSCODE_CLI_ALREADY_PREPARED', 'true'], ['VSCODE_CLI_REMOTE_LICENSE_TEXT', product.serverLicense?.join('\\n')], ['VSCODE_CLI_REMOTE_LICENSE_PROMPT', product.serverLicensePrompt], ['VSCODE_CLI_AI_KEY', product.aiConfig?.cliKey], diff --git a/build/azure-pipelines/common/createAsset.js b/build/azure-pipelines/common/createAsset.js index c46745f351e..e4ca63b6573 100644 --- a/build/azure-pipelines/common/createAsset.js +++ b/build/azure-pipelines/common/createAsset.js @@ -167,10 +167,11 @@ async function main() { }; const uploadPromises = []; if (await blobClient.exists()) { - console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`); + uploadPromises.push(Promise.reject(new Error(`Blob ${quality}, ${blobName} already exists, not publishing again.`))); } else { - uploadPromises.push((0, retry_1.retry)(async () => { + uploadPromises.push((0, retry_1.retry)(async (attempt) => { + console.log(`Uploading blobs to Azure storage (attempt ${attempt})...`); await blobClient.uploadFile(filePath, blobOptions); console.log('Blob successfully uploaded to Azure storage.'); })); @@ -182,25 +183,29 @@ async function main() { const mooncakeContainerClient = mooncakeBlobServiceClient.getContainerClient(quality); const mooncakeBlobClient = mooncakeContainerClient.getBlockBlobClient(blobName); if (await mooncakeBlobClient.exists()) { - console.log(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`); + uploadPromises.push(Promise.reject(new Error(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`))); } else { - uploadPromises.push((0, retry_1.retry)(async () => { + uploadPromises.push((0, retry_1.retry)(async (attempt) => { + console.log(`Uploading blobs to Mooncake Azure storage (attempt ${attempt})...`); await mooncakeBlobClient.uploadFile(filePath, blobOptions); console.log('Blob successfully uploaded to Mooncake Azure storage.'); })); } - if (uploadPromises.length) { - console.log('Uploading blobs to Azure storage and Mooncake Azure storage...'); - } + } + const promiseResults = await Promise.allSettled(uploadPromises); + const rejectedPromiseResults = promiseResults.filter(result => result.status === 'rejected'); + if (rejectedPromiseResults.length === 0) { + console.log('All blobs successfully uploaded.'); + } + else if (rejectedPromiseResults[0]?.reason?.message?.includes('already exists')) { + console.warn(rejectedPromiseResults[0].reason.message); + console.log('Some blobs successfully uploaded.'); } else { - if (uploadPromises.length) { - console.log('Uploading blobs to Azure storage...'); - } + // eslint-disable-next-line no-throw-literal + throw rejectedPromiseResults[0]?.reason; } - await Promise.all(uploadPromises); - console.log(uploadPromises.length ? 'All blobs successfully uploaded.' : 'No blobs to upload.'); const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`; const blobPath = new URL(assetUrl).pathname; const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`; @@ -230,4 +235,4 @@ main().then(() => { console.error(err); process.exit(1); }); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createAsset.js","sourceRoot":"","sources":["createAsset.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;AAEhG,yBAAyB;AAEzB,iCAAiC;AACjC,sDAAwI;AACxI,6BAA6B;AAC7B,0CAA6C;AAC7C,8CAAyD;AACzD,mCAAgC;AAahC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;IAC9B,OAAO,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;IAC3E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;CACjB;AAED,wFAAwF;AACxF,SAAS,WAAW,CAAC,OAAe,EAAE,EAAU,EAAE,IAAY,EAAE,IAAY;IAC3E,QAAQ,EAAE,EAAE;QACX,KAAK,OAAO;YACX,QAAQ,OAAO,EAAE;gBAChB,KAAK,QAAQ,CAAC,CAAC;oBACd,MAAM,KAAK,GAAG,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC;oBAC1D,QAAQ,IAAI,EAAE;wBACb,KAAK,SAAS;4BACb,OAAO,GAAG,KAAK,UAAU,CAAC;wBAC3B,KAAK,OAAO;4BACX,OAAO,KAAK,CAAC;wBACd,KAAK,YAAY;4BAChB,OAAO,GAAG,KAAK,OAAO,CAAC;wBACxB;4BACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;qBACnE;iBACD;gBACD,KAAK,QAAQ;oBACZ,IAAI,IAAI,KAAK,OAAO,EAAE;wBACrB,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;qBAClE;oBACD,OAAO,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,IAAI,EAAE,CAAC;gBAClE,KAAK,KAAK;oBACT,IAAI,IAAI,KAAK,OAAO,EAAE;wBACrB,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;qBAClE;oBACD,OAAO,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,gBAAgB,IAAI,MAAM,CAAC;gBAC1E,KAAK,KAAK;oBACT,OAAO,aAAa,IAAI,EAAE,CAAC;gBAC5B;oBACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;aACnE;QACF,KAAK,QAAQ;YACZ,QAAQ,OAAO,EAAE;gBAChB,KAAK,QAAQ;oBACZ,OAAO,iBAAiB,IAAI,EAAE,CAAC;gBAChC,KAAK,KAAK;oBACT,OAAO,iBAAiB,IAAI,MAAM,CAAC;gBACpC,KAAK,KAAK;oBACT,OAAO,cAAc,IAAI,EAAE,CAAC;gBAC7B;oBACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;aACnE;QACF,KAAK,OAAO;YACX,QAAQ,IAAI,EAAE;gBACb,KAAK,MAAM;oBACV,OAAO,cAAc,IAAI,EAAE,CAAC;gBAC7B,KAAK,kBAAkB;oBACtB,QAAQ,OAAO,EAAE;wBAChB,KAAK,QAAQ;4BACZ,OAAO,SAAS,IAAI,EAAE,CAAC;wBACxB,KAAK,QAAQ;4BACZ,OAAO,gBAAgB,IAAI,EAAE,CAAC;wBAC/B,KAAK,KAAK;4BACT,OAAO,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,IAAI,MAAM,CAAC;wBAC9E;4BACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;qBACnE;gBACF,KAAK,aAAa;oBACjB,OAAO,aAAa,IAAI,EAAE,CAAC;gBAC5B,KAAK,aAAa;oBACjB,OAAO,aAAa,IAAI,EAAE,CAAC;gBAC5B,KAAK,KAAK;oBACT,OAAO,aAAa,IAAI,EAAE,CAAC;gBAC5B;oBACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;aACnE;QACF,KAAK,QAAQ;YACZ,QAAQ,OAAO,EAAE;gBAChB,KAAK,QAAQ;oBACZ,IAAI,IAAI,KAAK,KAAK,EAAE;wBACnB,OAAO,QAAQ,CAAC;qBAChB;oBACD,OAAO,UAAU,IAAI,EAAE,CAAC;gBACzB,KAAK,QAAQ;oBACZ,IAAI,IAAI,KAAK,KAAK,EAAE;wBACnB,OAAO,eAAe,CAAC;qBACvB;oBACD,OAAO,iBAAiB,IAAI,EAAE,CAAC;gBAChC,KAAK,KAAK;oBACT,IAAI,IAAI,KAAK,KAAK,EAAE;wBACnB,OAAO,mBAAmB,CAAC;qBAC3B;oBACD,OAAO,iBAAiB,IAAI,MAAM,CAAC;gBACpC,KAAK,KAAK;oBACT,OAAO,cAAc,IAAI,EAAE,CAAC;gBAC7B;oBACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;aACnE;QACF;YACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;KACnE;AACF,CAAC;AAED,8EAA8E;AAC9E,SAAS,WAAW,CAAC,IAAY;IAChC,QAAQ,IAAI,EAAE;QACb,KAAK,YAAY;YAChB,OAAO,OAAO,CAAC;QAChB,KAAK,aAAa,CAAC;QACnB,KAAK,aAAa;YACjB,OAAO,SAAS,CAAC;QAClB;YACC,OAAO,IAAI,CAAC;KACb;AACF,CAAC;AAED,SAAS,UAAU,CAAC,QAAgB,EAAE,MAAgB;IACrD,OAAO,IAAI,OAAO,CAAS,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACnC,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAE3C,MAAM;aACJ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;aACd,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,MAAM,CAAC,IAAY;IAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEjC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QAClC,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;KACxC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED,KAAK,UAAU,IAAI;IAClB,MAAM,CAAC,EAAE,AAAD,EAAG,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAClF,wCAAwC;IACxC,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAE7C,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAEjC,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAAW,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7G,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IAEvB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAE3B,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAE7G,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/B,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAEnC,MAAM,QAAQ,GAAG,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC;IAEzC,MAAM,sBAAsB,GAA2B,EAAE,YAAY,EAAE,EAAE,eAAe,EAAE,qCAAsB,CAAC,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC;IAE9K,MAAM,UAAU,GAAG,IAAI,iCAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAE,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAE,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAE,CAAC,CAAC;IACrJ,MAAM,iBAAiB,GAAG,IAAI,gCAAiB,CAAC,sCAAsC,EAAE,UAAU,EAAE,sBAAsB,CAAC,CAAC;IAC5H,MAAM,eAAe,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,eAAe,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAEhE,MAAM,WAAW,GAAmC;QACnD,eAAe,EAAE;YAChB,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;YACtC,sBAAsB,EAAE,yBAAyB,QAAQ,GAAG;YAC5D,gBAAgB,EAAE,0BAA0B;SAC5C;KACD,CAAC;IAEF,MAAM,cAAc,GAAoB,EAAE,CAAC;IAC3C,IAAI,MAAM,UAAU,CAAC,MAAM,EAAE,EAAE;QAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,OAAO,KAAK,QAAQ,wCAAwC,CAAC,CAAC;KAClF;SAAM;QACN,cAAc,CAAC,IAAI,CAAC,IAAA,aAAK,EAAC,KAAK,IAAI,EAAE;YACpC,MAAM,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YACnD,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC,CAAC;KACJ;IAED,MAAM,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,IAAI,MAAM,CAAC,CAAC;IAEjG,IAAI,sBAAsB,EAAE;QAC3B,MAAM,kBAAkB,GAAG,IAAI,iCAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAE,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAE,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAE,CAAC,CAAC;QACxL,MAAM,yBAAyB,GAAG,IAAI,gCAAiB,CAAC,2CAA2C,EAAE,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;QACjJ,MAAM,uBAAuB,GAAG,yBAAyB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACtF,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAEhF,IAAI,MAAM,kBAAkB,CAAC,MAAM,EAAE,EAAE;YACtC,OAAO,CAAC,GAAG,CAAC,iBAAiB,OAAO,KAAK,QAAQ,wCAAwC,CAAC,CAAC;SAC3F;aAAM;YACN,cAAc,CAAC,IAAI,CAAC,IAAA,aAAK,EAAC,KAAK,IAAI,EAAE;gBACpC,MAAM,kBAAkB,CAAC,UAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC3D,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;YACtE,CAAC,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,cAAc,CAAC,MAAM,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC;SAC9E;KACD;SAAM;QACN,IAAI,cAAc,CAAC,MAAM,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;SACnD;KACD;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAElC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC;IAEhG,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;IAC1E,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;IAC5C,MAAM,WAAW,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,QAAQ,EAAE,CAAC;IAEpE,MAAM,KAAK,GAAU;QACpB,QAAQ;QACR,IAAI;QACJ,GAAG,EAAE,QAAQ;QACb,IAAI,EAAE,QAAQ;QACd,WAAW;QACX,UAAU;QACV,IAAI;KACJ,CAAC;IAEF,mEAAmE;IACnE,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAC3B,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;KAChC;IAED,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,IAAI,qBAAY,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAE,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC;IACrH,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;IACrE,MAAM,IAAA,aAAK,EAAC,GAAG,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAE7F,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC1B,CAAC;AAED,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IAChB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,EAAE,GAAG,CAAC,EAAE;IACR,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createAsset.js","sourceRoot":"","sources":["createAsset.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;AAEhG,yBAAyB;AAEzB,iCAAiC;AACjC,sDAAwI;AACxI,6BAA6B;AAC7B,0CAA6C;AAC7C,8CAAyD;AACzD,mCAAgC;AAahC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;IAC9B,OAAO,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;IAC3E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;CACjB;AAED,wFAAwF;AACxF,SAAS,WAAW,CAAC,OAAe,EAAE,EAAU,EAAE,IAAY,EAAE,IAAY;IAC3E,QAAQ,EAAE,EAAE;QACX,KAAK,OAAO;YACX,QAAQ,OAAO,EAAE;gBAChB,KAAK,QAAQ,CAAC,CAAC;oBACd,MAAM,KAAK,GAAG,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC;oBAC1D,QAAQ,IAAI,EAAE;wBACb,KAAK,SAAS;4BACb,OAAO,GAAG,KAAK,UAAU,CAAC;wBAC3B,KAAK,OAAO;4BACX,OAAO,KAAK,CAAC;wBACd,KAAK,YAAY;4BAChB,OAAO,GAAG,KAAK,OAAO,CAAC;wBACxB;4BACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;qBACnE;iBACD;gBACD,KAAK,QAAQ;oBACZ,IAAI,IAAI,KAAK,OAAO,EAAE;wBACrB,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;qBAClE;oBACD,OAAO,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,IAAI,EAAE,CAAC;gBAClE,KAAK,KAAK;oBACT,IAAI,IAAI,KAAK,OAAO,EAAE;wBACrB,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;qBAClE;oBACD,OAAO,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,gBAAgB,IAAI,MAAM,CAAC;gBAC1E,KAAK,KAAK;oBACT,OAAO,aAAa,IAAI,EAAE,CAAC;gBAC5B;oBACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;aACnE;QACF,KAAK,QAAQ;YACZ,QAAQ,OAAO,EAAE;gBAChB,KAAK,QAAQ;oBACZ,OAAO,iBAAiB,IAAI,EAAE,CAAC;gBAChC,KAAK,KAAK;oBACT,OAAO,iBAAiB,IAAI,MAAM,CAAC;gBACpC,KAAK,KAAK;oBACT,OAAO,cAAc,IAAI,EAAE,CAAC;gBAC7B;oBACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;aACnE;QACF,KAAK,OAAO;YACX,QAAQ,IAAI,EAAE;gBACb,KAAK,MAAM;oBACV,OAAO,cAAc,IAAI,EAAE,CAAC;gBAC7B,KAAK,kBAAkB;oBACtB,QAAQ,OAAO,EAAE;wBAChB,KAAK,QAAQ;4BACZ,OAAO,SAAS,IAAI,EAAE,CAAC;wBACxB,KAAK,QAAQ;4BACZ,OAAO,gBAAgB,IAAI,EAAE,CAAC;wBAC/B,KAAK,KAAK;4BACT,OAAO,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,IAAI,MAAM,CAAC;wBAC9E;4BACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;qBACnE;gBACF,KAAK,aAAa;oBACjB,OAAO,aAAa,IAAI,EAAE,CAAC;gBAC5B,KAAK,aAAa;oBACjB,OAAO,aAAa,IAAI,EAAE,CAAC;gBAC5B,KAAK,KAAK;oBACT,OAAO,aAAa,IAAI,EAAE,CAAC;gBAC5B;oBACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;aACnE;QACF,KAAK,QAAQ;YACZ,QAAQ,OAAO,EAAE;gBAChB,KAAK,QAAQ;oBACZ,IAAI,IAAI,KAAK,KAAK,EAAE;wBACnB,OAAO,QAAQ,CAAC;qBAChB;oBACD,OAAO,UAAU,IAAI,EAAE,CAAC;gBACzB,KAAK,QAAQ;oBACZ,IAAI,IAAI,KAAK,KAAK,EAAE;wBACnB,OAAO,eAAe,CAAC;qBACvB;oBACD,OAAO,iBAAiB,IAAI,EAAE,CAAC;gBAChC,KAAK,KAAK;oBACT,IAAI,IAAI,KAAK,KAAK,EAAE;wBACnB,OAAO,mBAAmB,CAAC;qBAC3B;oBACD,OAAO,iBAAiB,IAAI,MAAM,CAAC;gBACpC,KAAK,KAAK;oBACT,OAAO,cAAc,IAAI,EAAE,CAAC;gBAC7B;oBACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;aACnE;QACF;YACC,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;KACnE;AACF,CAAC;AAED,8EAA8E;AAC9E,SAAS,WAAW,CAAC,IAAY;IAChC,QAAQ,IAAI,EAAE;QACb,KAAK,YAAY;YAChB,OAAO,OAAO,CAAC;QAChB,KAAK,aAAa,CAAC;QACnB,KAAK,aAAa;YACjB,OAAO,SAAS,CAAC;QAClB;YACC,OAAO,IAAI,CAAC;KACb;AACF,CAAC;AAED,SAAS,UAAU,CAAC,QAAgB,EAAE,MAAgB;IACrD,OAAO,IAAI,OAAO,CAAS,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACnC,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAE3C,MAAM;aACJ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;aACd,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,MAAM,CAAC,IAAY;IAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEjC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QAClC,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;KACxC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED,KAAK,UAAU,IAAI;IAClB,MAAM,CAAC,EAAE,AAAD,EAAG,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAClF,wCAAwC;IACxC,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAE7C,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAEjC,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAAW,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7G,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IAEvB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAE3B,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAE7G,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/B,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAEnC,MAAM,QAAQ,GAAG,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC;IAEzC,MAAM,sBAAsB,GAA2B,EAAE,YAAY,EAAE,EAAE,eAAe,EAAE,qCAAsB,CAAC,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC;IAE9K,MAAM,UAAU,GAAG,IAAI,iCAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAE,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAE,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAE,CAAC,CAAC;IACrJ,MAAM,iBAAiB,GAAG,IAAI,gCAAiB,CAAC,sCAAsC,EAAE,UAAU,EAAE,sBAAsB,CAAC,CAAC;IAC5H,MAAM,eAAe,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,eAAe,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAEhE,MAAM,WAAW,GAAmC;QACnD,eAAe,EAAE;YAChB,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;YACtC,sBAAsB,EAAE,yBAAyB,QAAQ,GAAG;YAC5D,gBAAgB,EAAE,0BAA0B;SAC5C;KACD,CAAC;IAEF,MAAM,cAAc,GAAoB,EAAE,CAAC;IAE3C,IAAI,MAAM,UAAU,CAAC,MAAM,EAAE,EAAE;QAC9B,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,OAAO,KAAK,QAAQ,wCAAwC,CAAC,CAAC,CAAC,CAAC;KACrH;SAAM;QACN,cAAc,CAAC,IAAI,CAAC,IAAA,aAAK,EAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAC3C,OAAO,CAAC,GAAG,CAAC,6CAA6C,OAAO,MAAM,CAAC,CAAC;YACxE,MAAM,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YACnD,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC,CAAC;KACJ;IAED,MAAM,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,IAAI,MAAM,CAAC,CAAC;IAEjG,IAAI,sBAAsB,EAAE;QAC3B,MAAM,kBAAkB,GAAG,IAAI,iCAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAE,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAE,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAE,CAAC,CAAC;QACxL,MAAM,yBAAyB,GAAG,IAAI,gCAAiB,CAAC,2CAA2C,EAAE,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;QACjJ,MAAM,uBAAuB,GAAG,yBAAyB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACtF,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAEhF,IAAI,MAAM,kBAAkB,CAAC,MAAM,EAAE,EAAE;YACtC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,OAAO,KAAK,QAAQ,wCAAwC,CAAC,CAAC,CAAC,CAAC;SAC9H;aAAM;YACN,cAAc,CAAC,IAAI,CAAC,IAAA,aAAK,EAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBAC3C,OAAO,CAAC,GAAG,CAAC,sDAAsD,OAAO,MAAM,CAAC,CAAC;gBACjF,MAAM,kBAAkB,CAAC,UAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC3D,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;YACtE,CAAC,CAAC,CAAC,CAAC;SACJ;KACD;IAED,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAChE,MAAM,sBAAsB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU,CAA4B,CAAC;IAExH,IAAI,sBAAsB,CAAC,MAAM,KAAK,CAAC,EAAE;QACxC,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;KAChD;SAAM,IAAI,sBAAsB,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE;QAClF,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;KACjD;SAAM;QACN,4CAA4C;QAC5C,MAAM,sBAAsB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;KACxC;IAED,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;IAC1E,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;IAC5C,MAAM,WAAW,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,QAAQ,EAAE,CAAC;IAEpE,MAAM,KAAK,GAAU;QACpB,QAAQ;QACR,IAAI;QACJ,GAAG,EAAE,QAAQ;QACb,IAAI,EAAE,QAAQ;QACd,WAAW;QACX,UAAU;QACV,IAAI;KACJ,CAAC;IAEF,mEAAmE;IACnE,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAC3B,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;KAChC;IAED,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,IAAI,qBAAY,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAE,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC;IACrH,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;IACrE,MAAM,IAAA,aAAK,EAAC,GAAG,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAE7F,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC1B,CAAC;AAED,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IAChB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,EAAE,GAAG,CAAC,EAAE;IACR,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/build/azure-pipelines/common/createAsset.ts b/build/azure-pipelines/common/createAsset.ts index 2f3f27c1d5b..74c76407a78 100644 --- a/build/azure-pipelines/common/createAsset.ts +++ b/build/azure-pipelines/common/createAsset.ts @@ -196,10 +196,12 @@ async function main(): Promise { }; const uploadPromises: Promise[] = []; + if (await blobClient.exists()) { - console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`); + uploadPromises.push(Promise.reject(new Error(`Blob ${quality}, ${blobName} already exists, not publishing again.`))); } else { - uploadPromises.push(retry(async () => { + uploadPromises.push(retry(async (attempt) => { + console.log(`Uploading blobs to Azure storage (attempt ${attempt})...`); await blobClient.uploadFile(filePath, blobOptions); console.log('Blob successfully uploaded to Azure storage.'); })); @@ -214,26 +216,28 @@ async function main(): Promise { const mooncakeBlobClient = mooncakeContainerClient.getBlockBlobClient(blobName); if (await mooncakeBlobClient.exists()) { - console.log(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`); + uploadPromises.push(Promise.reject(new Error(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`))); } else { - uploadPromises.push(retry(async () => { + uploadPromises.push(retry(async (attempt) => { + console.log(`Uploading blobs to Mooncake Azure storage (attempt ${attempt})...`); await mooncakeBlobClient.uploadFile(filePath, blobOptions); console.log('Blob successfully uploaded to Mooncake Azure storage.'); })); } - - if (uploadPromises.length) { - console.log('Uploading blobs to Azure storage and Mooncake Azure storage...'); - } - } else { - if (uploadPromises.length) { - console.log('Uploading blobs to Azure storage...'); - } } - await Promise.all(uploadPromises); + const promiseResults = await Promise.allSettled(uploadPromises); + const rejectedPromiseResults = promiseResults.filter(result => result.status === 'rejected') as PromiseRejectedResult[]; - console.log(uploadPromises.length ? 'All blobs successfully uploaded.' : 'No blobs to upload.'); + if (rejectedPromiseResults.length === 0) { + console.log('All blobs successfully uploaded.'); + } else if (rejectedPromiseResults[0]?.reason?.message?.includes('already exists')) { + console.warn(rejectedPromiseResults[0].reason.message); + console.log('Some blobs successfully uploaded.'); + } else { + // eslint-disable-next-line no-throw-literal + throw rejectedPromiseResults[0]?.reason; + } const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`; const blobPath = new URL(assetUrl).pathname; diff --git a/build/azure-pipelines/common/releaseBuild.js b/build/azure-pipelines/common/releaseBuild.js index 5ba4e218ae0..752cb4db92c 100644 --- a/build/azure-pipelines/common/releaseBuild.js +++ b/build/azure-pipelines/common/releaseBuild.js @@ -46,11 +46,12 @@ async function main(force) { await (0, retry_1.retry)(() => scripts.storedProcedure('releaseBuild').execute('', [commit])); } const [, , force] = process.argv; -main(force === 'true').then(() => { +console.log(process.argv); +main(/^true$/i.test(force)).then(() => { console.log('Build successfully released'); process.exit(0); }, err => { console.error(err); process.exit(1); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVsZWFzZUJ1aWxkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVsZWFzZUJ1aWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcsOENBQXlEO0FBQ3pELDBDQUE2QztBQUM3QyxtQ0FBZ0M7QUFFaEMsU0FBUyxNQUFNLENBQUMsSUFBWTtJQUMzQixNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpDLElBQUksT0FBTyxNQUFNLEtBQUssV0FBVyxFQUFFO1FBQ2xDLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxHQUFHLElBQUksQ0FBQyxDQUFDO0tBQ3hDO0lBRUQsT0FBTyxNQUFNLENBQUM7QUFDZixDQUFDO0FBT0QsU0FBUyxtQkFBbUIsQ0FBQyxPQUFlO0lBQzNDLE9BQU87UUFDTixFQUFFLEVBQUUsT0FBTztRQUNYLE1BQU0sRUFBRSxLQUFLO0tBQ2IsQ0FBQztBQUNILENBQUM7QUFFRCxLQUFLLFVBQVUsU0FBUyxDQUFDLE1BQW9CLEVBQUUsT0FBZTtJQUM3RCxNQUFNLEtBQUssR0FBRyx1Q0FBdUMsT0FBTyxHQUFHLENBQUM7SUFFaEUsTUFBTSxHQUFHLEdBQUcsTUFBTSxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBRTlGLElBQUksR0FBRyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQy9CLE9BQU8sbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUM7S0FDcEM7SUFFRCxPQUFPLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFXLENBQUM7QUFDbkMsQ0FBQztBQUVELEtBQUssVUFBVSxJQUFJLENBQUMsS0FBYztJQUNqQyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMscUJBQXFCLENBQUMsQ0FBQztJQUM3QyxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUV6QyxNQUFNLGNBQWMsR0FBRyxJQUFJLGlDQUFzQixDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUUsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBRSxDQUFDLENBQUM7SUFDekosTUFBTSxNQUFNLEdBQUcsSUFBSSxxQkFBWSxDQUFDLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsMkJBQTJCLENBQUUsRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFDO0lBRXpHLElBQUksQ0FBQyxLQUFLLEVBQUU7UUFDWCxNQUFNLE1BQU0sR0FBRyxNQUFNLFNBQVMsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFFaEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUV2QyxJQUFJLE1BQU0sQ0FBQyxNQUFNLEVBQUU7WUFDbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQ0FBb0MsT0FBTyxhQUFhLENBQUMsQ0FBQztZQUN0RSxPQUFPO1NBQ1A7S0FDRDtJQUVELE9BQU8sQ0FBQyxHQUFHLENBQUMsbUJBQW1CLE1BQU0sS0FBSyxDQUFDLENBQUM7SUFFNUMsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFDO0lBQ3JFLE1BQU0sSUFBQSxhQUFLLEVBQUMsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xGLENBQUM7QUFFRCxNQUFNLENBQUMsRUFBRSxBQUFELEVBQUcsS0FBSyxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztBQUVqQyxJQUFJLENBQUMsS0FBSyxLQUFLLE1BQU0sQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUU7SUFDaEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDO0lBQzNDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakIsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxFQUFFO0lBQ1IsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2pCLENBQUMsQ0FBQyxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVsZWFzZUJ1aWxkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVsZWFzZUJ1aWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcsOENBQXlEO0FBQ3pELDBDQUE2QztBQUM3QyxtQ0FBZ0M7QUFFaEMsU0FBUyxNQUFNLENBQUMsSUFBWTtJQUMzQixNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpDLElBQUksT0FBTyxNQUFNLEtBQUssV0FBVyxFQUFFO1FBQ2xDLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxHQUFHLElBQUksQ0FBQyxDQUFDO0tBQ3hDO0lBRUQsT0FBTyxNQUFNLENBQUM7QUFDZixDQUFDO0FBT0QsU0FBUyxtQkFBbUIsQ0FBQyxPQUFlO0lBQzNDLE9BQU87UUFDTixFQUFFLEVBQUUsT0FBTztRQUNYLE1BQU0sRUFBRSxLQUFLO0tBQ2IsQ0FBQztBQUNILENBQUM7QUFFRCxLQUFLLFVBQVUsU0FBUyxDQUFDLE1BQW9CLEVBQUUsT0FBZTtJQUM3RCxNQUFNLEtBQUssR0FBRyx1Q0FBdUMsT0FBTyxHQUFHLENBQUM7SUFFaEUsTUFBTSxHQUFHLEdBQUcsTUFBTSxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBRTlGLElBQUksR0FBRyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQy9CLE9BQU8sbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUM7S0FDcEM7SUFFRCxPQUFPLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFXLENBQUM7QUFDbkMsQ0FBQztBQUVELEtBQUssVUFBVSxJQUFJLENBQUMsS0FBYztJQUNqQyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMscUJBQXFCLENBQUMsQ0FBQztJQUM3QyxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUV6QyxNQUFNLGNBQWMsR0FBRyxJQUFJLGlDQUFzQixDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUUsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBRSxDQUFDLENBQUM7SUFDekosTUFBTSxNQUFNLEdBQUcsSUFBSSxxQkFBWSxDQUFDLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsMkJBQTJCLENBQUUsRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFDO0lBRXpHLElBQUksQ0FBQyxLQUFLLEVBQUU7UUFDWCxNQUFNLE1BQU0sR0FBRyxNQUFNLFNBQVMsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFFaEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUV2QyxJQUFJLE1BQU0sQ0FBQyxNQUFNLEVBQUU7WUFDbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQ0FBb0MsT0FBTyxhQUFhLENBQUMsQ0FBQztZQUN0RSxPQUFPO1NBQ1A7S0FDRDtJQUVELE9BQU8sQ0FBQyxHQUFHLENBQUMsbUJBQW1CLE1BQU0sS0FBSyxDQUFDLENBQUM7SUFFNUMsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFDO0lBQ3JFLE1BQU0sSUFBQSxhQUFLLEVBQUMsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xGLENBQUM7QUFFRCxNQUFNLENBQUMsRUFBRSxBQUFELEVBQUcsS0FBSyxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztBQUVqQyxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztBQUUxQixJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUU7SUFDckMsT0FBTyxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDO0lBQzNDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakIsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxFQUFFO0lBQ1IsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2pCLENBQUMsQ0FBQyxDQUFDIn0= \ No newline at end of file diff --git a/build/azure-pipelines/common/releaseBuild.ts b/build/azure-pipelines/common/releaseBuild.ts index fda389f3455..2e8fff04fb4 100644 --- a/build/azure-pipelines/common/releaseBuild.ts +++ b/build/azure-pipelines/common/releaseBuild.ts @@ -67,7 +67,9 @@ async function main(force: boolean): Promise { const [, , force] = process.argv; -main(force === 'true').then(() => { +console.log(process.argv); + +main(/^true$/i.test(force)).then(() => { console.log('Build successfully released'); process.exit(0); }, err => { diff --git a/build/azure-pipelines/common/retry.js b/build/azure-pipelines/common/retry.js index 5330d540ced..657f1a5b08d 100644 --- a/build/azure-pipelines/common/retry.js +++ b/build/azure-pipelines/common/retry.js @@ -9,7 +9,7 @@ async function retry(fn) { let lastError; for (let run = 1; run <= 10; run++) { try { - return await fn(); + return await fn(run); } catch (err) { if (!/ECONNRESET|CredentialUnavailableError|Audience validation failed/i.test(err.message)) { @@ -26,4 +26,4 @@ async function retry(fn) { throw lastError; } exports.retry = retry; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmV0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJyZXRyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUV6RixLQUFLLFVBQVUsS0FBSyxDQUFJLEVBQW9CO0lBQ2xELElBQUksU0FBNEIsQ0FBQztJQUVqQyxLQUFLLElBQUksR0FBRyxHQUFHLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ25DLElBQUk7WUFDSCxPQUFPLE1BQU0sRUFBRSxFQUFFLENBQUM7U0FDbEI7UUFBQyxPQUFPLEdBQUcsRUFBRTtZQUNiLElBQUksQ0FBQyxtRUFBbUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUMzRixNQUFNLEdBQUcsQ0FBQzthQUNWO1lBRUQsU0FBUyxHQUFHLEdBQUcsQ0FBQztZQUNoQixNQUFNLE1BQU0sR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ2pFLE9BQU8sQ0FBQyxHQUFHLENBQUMsK0JBQStCLE1BQU0sT0FBTyxDQUFDLENBQUM7WUFFMUQsMENBQTBDO1lBQzFDLE1BQU0sSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7U0FDOUM7S0FDRDtJQUVELE9BQU8sQ0FBQyxHQUFHLENBQUMsNkJBQTZCLENBQUMsQ0FBQztJQUMzQyxNQUFNLFNBQVMsQ0FBQztBQUNqQixDQUFDO0FBdEJELHNCQXNCQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmV0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJyZXRyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUV6RixLQUFLLFVBQVUsS0FBSyxDQUFJLEVBQW1DO0lBQ2pFLElBQUksU0FBNEIsQ0FBQztJQUVqQyxLQUFLLElBQUksR0FBRyxHQUFHLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ25DLElBQUk7WUFDSCxPQUFPLE1BQU0sRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ3JCO1FBQUMsT0FBTyxHQUFHLEVBQUU7WUFDYixJQUFJLENBQUMsbUVBQW1FLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRTtnQkFDM0YsTUFBTSxHQUFHLENBQUM7YUFDVjtZQUVELFNBQVMsR0FBRyxHQUFHLENBQUM7WUFDaEIsTUFBTSxNQUFNLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztZQUNqRSxPQUFPLENBQUMsR0FBRyxDQUFDLCtCQUErQixNQUFNLE9BQU8sQ0FBQyxDQUFDO1lBRTFELDBDQUEwQztZQUMxQyxNQUFNLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO1NBQzlDO0tBQ0Q7SUFFRCxPQUFPLENBQUMsR0FBRyxDQUFDLDZCQUE2QixDQUFDLENBQUM7SUFDM0MsTUFBTSxTQUFTLENBQUM7QUFDakIsQ0FBQztBQXRCRCxzQkFzQkMifQ== \ No newline at end of file diff --git a/build/azure-pipelines/common/retry.ts b/build/azure-pipelines/common/retry.ts index ed232245dec..9b28b4fd956 100644 --- a/build/azure-pipelines/common/retry.ts +++ b/build/azure-pipelines/common/retry.ts @@ -3,12 +3,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -export async function retry(fn: () => Promise): Promise { +export async function retry(fn: (attempt: number) => Promise): Promise { let lastError: Error | undefined; for (let run = 1; run <= 10; run++) { try { - return await fn(); + return await fn(run); } catch (err) { if (!/ECONNRESET|CredentialUnavailableError|Audience validation failed/i.test(err.message)) { throw err; diff --git a/build/azure-pipelines/darwin/cli-build-darwin.yml b/build/azure-pipelines/darwin/cli-build-darwin.yml index ac129aca250..8d98f0e93aa 100644 --- a/build/azure-pipelines/darwin/cli-build-darwin.yml +++ b/build/azure-pipelines/darwin/cli-build-darwin.yml @@ -7,6 +7,9 @@ parameters: - name: VSCODE_BUILD_MACOS_ARM64 type: boolean default: false + - name: VSCODE_CHECK_ONLY + type: boolean + default: false steps: - task: NodeTool@0 @@ -14,15 +17,13 @@ steps: versionSpec: "16.x" - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - template: ../distro/download-distro.yml - - script: node build/azure-pipelines/distro/apply-cli-patches - displayName: Apply distro patches + - template: ../cli/cli-apply-patches.yml - task: Npm@1 displayName: Download openssl prebuilt inputs: command: custom - customCommand: pack @vscode-internal/openssl-prebuilt@0.0.5 + customCommand: pack @vscode-internal/openssl-prebuilt@0.0.8 customRegistry: useFeed customFeed: "Monaco/openssl-prebuilt" workingDir: $(Build.ArtifactStagingDirectory) @@ -30,7 +31,7 @@ steps: - script: | set -e mkdir $(Build.ArtifactStagingDirectory)/openssl - tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl + tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.8.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl displayName: Extract openssl prebuilt - script: node build/azure-pipelines/cli/prepare.js @@ -53,6 +54,7 @@ steps: parameters: VSCODE_CLI_TARGET: x86_64-apple-darwin VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_x64_cli + VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }} VSCODE_CLI_ENV: OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/lib OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/include @@ -62,6 +64,7 @@ steps: parameters: VSCODE_CLI_TARGET: aarch64-apple-darwin VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_arm64_cli + VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }} VSCODE_CLI_ENV: OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/lib OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/include diff --git a/build/azure-pipelines/darwin/product-build-darwin-test.yml b/build/azure-pipelines/darwin/product-build-darwin-test.yml index 35fee8f5240..1ca8c9ec1a9 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-test.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-test.yml @@ -13,6 +13,7 @@ steps: env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Download Electron and Playwright + retryCountOnTaskFailure: 3 - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: @@ -56,6 +57,7 @@ steps: compile-extension:github-authentication \ compile-extension:html-language-features-server \ compile-extension:ipynb \ + compile-extension:notebook-renderers \ compile-extension:json-language-features-server \ compile-extension:markdown-language-features-server \ compile-extension:markdown-language-features \ @@ -83,13 +85,13 @@ steps: INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \ ./scripts/test-integration.sh --build --tfs "Integration Tests" env: - VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH) displayName: Run integration tests (Electron) timeoutInMinutes: 20 - script: ./scripts/test-web-integration.sh --browser webkit env: - VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web displayName: Run integration tests (Browser, Webkit) timeoutInMinutes: 20 @@ -100,7 +102,7 @@ steps: INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \ ./scripts/test-remote-integration.sh env: - VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH) displayName: Run integration tests (Remote) timeoutInMinutes: 20 @@ -132,7 +134,7 @@ steps: - script: yarn smoketest-no-compile --web --tracing --headless env: - VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web timeoutInMinutes: 20 displayName: Run smoke tests (Browser, Chromium) @@ -143,7 +145,7 @@ steps: APP_NAME="`ls $APP_ROOT | head -n 1`" yarn smoketest-no-compile --tracing --remote --build "$APP_ROOT/$APP_NAME" env: - VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH) timeoutInMinutes: 20 displayName: Run smoke tests (Remote) diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index c315dbb3d3f..3d8e6dc67b8 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -111,17 +111,34 @@ steps: - template: ../common/install-builtin-extensions.yml - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci + - script: | + set -e + yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci + echo "##vso[task.setvariable variable=BUILT_CLIENT]true" env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Build client - - script: yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci + - script: | + set -e + yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci + mv ../vscode-reh-darwin-$(VSCODE_ARCH) ../vscode-server-darwin-$(VSCODE_ARCH) # TODO@joaomoreno + ARCHIVE_PATH=".build/darwin/server/vscode-server-darwin-$(VSCODE_ARCH).zip" + mkdir -p $(dirname $ARCHIVE_PATH) + (cd .. && zip -Xry $(Build.SourcesDirectory)/$ARCHIVE_PATH vscode-server-darwin-$(VSCODE_ARCH)) + echo "##vso[task.setvariable variable=SERVER_PATH]$ARCHIVE_PATH" env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Build server - - script: yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci + - script: | + set -e + yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci + mv ../vscode-reh-web-darwin-$(VSCODE_ARCH) ../vscode-server-darwin-$(VSCODE_ARCH)-web # TODO@joaomoreno + ARCHIVE_PATH=".build/darwin/server/vscode-server-darwin-$(VSCODE_ARCH)-web.zip" + mkdir -p $(dirname $ARCHIVE_PATH) + (cd .. && zip -Xry $(Build.SourcesDirectory)/$ARCHIVE_PATH vscode-server-darwin-$(VSCODE_ARCH)-web) + echo "##vso[task.setvariable variable=WEB_PATH]$ARCHIVE_PATH" env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Build server (web) @@ -176,18 +193,18 @@ steps: DEBUG=electron-osx-sign* node build/darwin/sign.js $(agent.builddirectory) displayName: Set Hardened Entitlements - - script: cd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * - displayName: Archive build - - script: | set -e + ARCHIVE_PATH=".build/darwin/client/VSCode-darwin-$(VSCODE_ARCH).zip" + mkdir -p $(dirname $ARCHIVE_PATH) + (cd ../VSCode-darwin-$(VSCODE_ARCH) && zip -Xry $(Build.SourcesDirectory)/$ARCHIVE_PATH *) + echo "##vso[task.setvariable variable=CLIENT_PATH]$ARCHIVE_PATH" + condition: and(succeededOrFailed(), eq(variables['BUILT_CLIENT'], 'true')) + displayName: Package client - # package Remote Extension Host - pushd .. && mv vscode-reh-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH) && zip -Xry vscode-server-darwin-$(VSCODE_ARCH).zip vscode-server-darwin-$(VSCODE_ARCH) && popd - - # package Remote Extension Host (Web) - pushd .. && mv vscode-reh-web-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH)-web && zip -Xry vscode-server-darwin-$(VSCODE_ARCH)-web.zip vscode-server-darwin-$(VSCODE_ARCH)-web && popd - displayName: Prepare to publish servers + - script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_" + condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')) + displayName: Generate artifact prefix - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: Generate SBOM (client) @@ -195,51 +212,31 @@ steps: BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) PackageName: Visual Studio Code - - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest - displayName: Publish SBOM (client) - artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: Generate SBOM (server) inputs: BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH) PackageName: Visual Studio Code Server + - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest + displayName: Publish SBOM (client) + artifact: $(ARTIFACT_PREFIX)sbom_client_darwin_$(VSCODE_ARCH)_sbom + - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest displayName: Publish SBOM (server) - artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom + artifact: $(ARTIFACT_PREFIX)sbom_server_darwin_$(VSCODE_ARCH)_sbom - - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip - artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive + - publish: $(CLIENT_PATH) + artifact: $(ARTIFACT_PREFIX)unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive + condition: and(succeededOrFailed(), ne(variables['CLIENT_PATH'], '')) displayName: Publish client archive - - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH).zip - artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned + - publish: $(SERVER_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned + condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], '')) displayName: Publish server archive - - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web.zip - artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned + - publish: $(WEB_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned + condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], '')) displayName: Publish web server archive - - - task: AzureCLI@2 - inputs: - azureSubscription: "vscode-builds-subscription" - scriptType: pscore - scriptLocation: inlineScript - addSpnToEnvironment: true - inlineScript: | - Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId" - Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId" - Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey" - - - script: | - set -e - AZURE_STORAGE_ACCOUNT="ticino" \ - AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \ - AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \ - AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \ - VSCODE_ARCH="$(VSCODE_ARCH)" \ - node build/azure-pipelines/upload-configuration - displayName: Upload configuration (for Bing settings search) - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) - continueOnError: true diff --git a/build/azure-pipelines/distro-build.yml b/build/azure-pipelines/distro-build.yml index b4d84aedd6f..fe05f56723b 100644 --- a/build/azure-pipelines/distro-build.yml +++ b/build/azure-pipelines/distro-build.yml @@ -11,5 +11,3 @@ steps: inputs: versionSpec: "16.x" - template: ./distro/download-distro.yml - - script: node build/azure-pipelines/distro/apply-cli-patches - displayName: Apply distro patches diff --git a/build/azure-pipelines/distro/apply-cli-patches.js b/build/azure-pipelines/distro/apply-cli-patches.js deleted file mode 100644 index 3ef9834b945..00000000000 --- a/build/azure-pipelines/distro/apply-cli-patches.js +++ /dev/null @@ -1,18 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -Object.defineProperty(exports, "__esModule", { value: true }); -const fs = require("fs"); -const cp = require("child_process"); -function log(...args) { - console.log(`[${new Date().toLocaleTimeString('en', { hour12: false })}]`, '[distro]', ...args); -} -log(`Applying CLI patches...`); -const basePath = `.build/distro/cli-patches`; -for (const patch of fs.readdirSync(basePath)) { - cp.execSync(`git apply --ignore-whitespace --ignore-space-change ${basePath}/${patch}`, { stdio: 'inherit' }); - log('Applied CLI patch:', patch, 'āœ”ļøŽ'); -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwbHktY2xpLXBhdGNoZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhcHBseS1jbGktcGF0Y2hlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLHlCQUF5QjtBQUN6QixvQ0FBb0M7QUFFcEMsU0FBUyxHQUFHLENBQUMsR0FBRyxJQUFXO0lBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxJQUFJLElBQUksRUFBRSxDQUFDLGtCQUFrQixDQUFDLElBQUksRUFBRSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxHQUFHLEVBQUUsVUFBVSxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7QUFDakcsQ0FBQztBQUVELEdBQUcsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO0FBRS9CLE1BQU0sUUFBUSxHQUFHLDJCQUEyQixDQUFDO0FBRTdDLEtBQUssTUFBTSxLQUFLLElBQUksRUFBRSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsRUFBRTtJQUM3QyxFQUFFLENBQUMsUUFBUSxDQUFDLHVEQUF1RCxRQUFRLElBQUksS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQztJQUM5RyxHQUFHLENBQUMsb0JBQW9CLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO0NBQ3ZDIn0= \ No newline at end of file diff --git a/build/azure-pipelines/distro/apply-cli-patches.ts b/build/azure-pipelines/distro/apply-cli-patches.ts deleted file mode 100644 index 9d1e0abc34c..00000000000 --- a/build/azure-pipelines/distro/apply-cli-patches.ts +++ /dev/null @@ -1,20 +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 * as fs from 'fs'; -import * as cp from 'child_process'; - -function log(...args: any[]): void { - console.log(`[${new Date().toLocaleTimeString('en', { hour12: false })}]`, '[distro]', ...args); -} - -log(`Applying CLI patches...`); - -const basePath = `.build/distro/cli-patches`; - -for (const patch of fs.readdirSync(basePath)) { - cp.execSync(`git apply --ignore-whitespace --ignore-space-change ${basePath}/${patch}`, { stdio: 'inherit' }); - log('Applied CLI patch:', patch, 'āœ”ļøŽ'); -} diff --git a/build/azure-pipelines/linux/cli-build-linux.yml b/build/azure-pipelines/linux/cli-build-linux.yml index 94c94931c80..4df126682cf 100644 --- a/build/azure-pipelines/linux/cli-build-linux.yml +++ b/build/azure-pipelines/linux/cli-build-linux.yml @@ -8,6 +8,9 @@ parameters: - name: VSCODE_BUILD_LINUX_ARMHF type: boolean default: false + - name: VSCODE_CHECK_ONLY + type: boolean + default: false - name: VSCODE_QUALITY type: string @@ -17,15 +20,13 @@ steps: versionSpec: "16.x" - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - template: ../distro/download-distro.yml - - script: node build/azure-pipelines/distro/apply-cli-patches - displayName: Apply distro patches + - template: ../cli/cli-apply-patches.yml - task: Npm@1 displayName: Download openssl prebuilt inputs: command: custom - customCommand: pack @vscode-internal/openssl-prebuilt@0.0.5 + customCommand: pack @vscode-internal/openssl-prebuilt@0.0.8 customRegistry: useFeed customFeed: "Monaco/openssl-prebuilt" workingDir: $(Build.ArtifactStagingDirectory) @@ -33,7 +34,7 @@ steps: - script: | set -e mkdir $(Build.ArtifactStagingDirectory)/openssl - tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl + tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.8.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl displayName: Extract openssl prebuilt - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}: @@ -66,6 +67,7 @@ steps: parameters: VSCODE_CLI_TARGET: aarch64-unknown-linux-gnu VSCODE_CLI_ARTIFACT: vscode_cli_linux_arm64_cli + VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }} VSCODE_CLI_ENV: CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib @@ -76,6 +78,7 @@ steps: parameters: VSCODE_CLI_TARGET: x86_64-unknown-linux-gnu VSCODE_CLI_ARTIFACT: vscode_cli_linux_x64_cli + VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }} VSCODE_CLI_ENV: OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/lib OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/include @@ -85,6 +88,7 @@ steps: parameters: VSCODE_CLI_TARGET: armv7-unknown-linux-gnueabihf VSCODE_CLI_ARTIFACT: vscode_cli_linux_armhf_cli + VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }} VSCODE_CLI_ENV: CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm-linux/lib diff --git a/build/azure-pipelines/linux/install.sh b/build/azure-pipelines/linux/install.sh new file mode 100755 index 00000000000..b8960fc5fd4 --- /dev/null +++ b/build/azure-pipelines/linux/install.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +set -e + +# To workaround the issue of yarn not respecting the registry value from .npmrc +yarn config set registry "$NPM_REGISTRY" + +if [ -z "$CC" ] || [ -z "$CXX" ]; then + # Download clang based on chromium revision used by vscode + curl -s https://raw.githubusercontent.com/chromium/chromium/108.0.5359.215/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + + # Download libcxx headers and objects from upstream electron releases + DEBUG=libcxx-fetcher \ + VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \ + VSCODE_LIBCXX_HEADERS_DIR=$PWD/.build/libcxx_headers \ + VSCODE_LIBCXXABI_HEADERS_DIR=$PWD/.build/libcxxabi_headers \ + VSCODE_ARCH="$npm_config_arch" \ + node build/linux/libcxx-fetcher.js + + # Set compiler toolchain + # Flags for the client build are based on + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/108.0.5359.215:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/108.0.5359.215:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/108.0.5359.215:build/config/c++/BUILD.gn + export CC=$PWD/.build/CR_Clang/bin/clang + export CXX=$PWD/.build/CR_Clang/bin/clang++ + export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr" + export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -Wl,--lto-O0" + export VSCODE_REMOTE_CC=$(which gcc) + export VSCODE_REMOTE_CXX=$(which g++) +fi + +for i in {1..5}; do # try 5 times + yarn --frozen-lockfile --check-files && break + if [ $i -eq 3 ]; then + echo "Yarn failed too many times" >&2 + exit 1 + fi + echo "Yarn failed $i, trying again..." +done diff --git a/build/azure-pipelines/linux/prepare-publish.sh b/build/azure-pipelines/linux/prepare-publish.sh deleted file mode 100755 index 891fa8024ef..00000000000 --- a/build/azure-pipelines/linux/prepare-publish.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env bash -set -e -REPO="$(pwd)" -ROOT="$REPO/.." - -# Publish tarball -PLATFORM_LINUX="linux-$VSCODE_ARCH" -BUILDNAME="VSCode-$PLATFORM_LINUX" -BUILD_VERSION="$(date +%s)" -[ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$VSCODE_ARCH-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$VSCODE_ARCH-$BUILD_VERSION.tar.gz" -TARBALL_PATH="$ROOT/$TARBALL_FILENAME" - -rm -rf $ROOT/code-*.tar.* -(cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME) - -# Publish Remote Extension Host -LEGACY_SERVER_BUILD_NAME="vscode-reh-$PLATFORM_LINUX" -SERVER_BUILD_NAME="vscode-server-$PLATFORM_LINUX" -SERVER_TARBALL_FILENAME="vscode-server-$PLATFORM_LINUX.tar.gz" -SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME" - -rm -rf $ROOT/vscode-server-*.tar.* -(cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME) - -# Publish Remote Extension Host (Web) -LEGACY_SERVER_BUILD_NAME="vscode-reh-web-$PLATFORM_LINUX" -SERVER_BUILD_NAME="vscode-server-$PLATFORM_LINUX-web" -SERVER_TARBALL_FILENAME="vscode-server-$PLATFORM_LINUX-web.tar.gz" -SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME" - -rm -rf $ROOT/vscode-server-*-web.tar.* -(cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME) - -# Publish DEB -case $VSCODE_ARCH in - x64) DEB_ARCH="amd64" ;; - *) DEB_ARCH="$VSCODE_ARCH" ;; -esac - -PLATFORM_DEB="linux-deb-$VSCODE_ARCH" -DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)" -DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME" - -# Publish RPM -case $VSCODE_ARCH in - x64) RPM_ARCH="x86_64" ;; - armhf) RPM_ARCH="armv7hl" ;; - arm64) RPM_ARCH="aarch64" ;; - *) RPM_ARCH="$VSCODE_ARCH" ;; -esac - -PLATFORM_RPM="linux-rpm-$VSCODE_ARCH" -RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)" -RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME" - -# Publish Snap -# Pack snap tarball artifact, in order to preserve file perms -mkdir -p $REPO/.build/linux/snap-tarball -SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$VSCODE_ARCH.tar.gz" -rm -rf $SNAP_TARBALL_PATH -(cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap) - -# Export DEB_PATH, RPM_PATH -echo "##vso[task.setvariable variable=DEB_PATH]$DEB_PATH" -echo "##vso[task.setvariable variable=RPM_PATH]$RPM_PATH" -echo "##vso[task.setvariable variable=TARBALL_PATH]$TARBALL_PATH" diff --git a/build/azure-pipelines/linux/product-build-linux-test.yml b/build/azure-pipelines/linux/product-build-linux-test.yml index a5a30a340fc..bb75be37e4b 100644 --- a/build/azure-pipelines/linux/product-build-linux-test.yml +++ b/build/azure-pipelines/linux/product-build-linux-test.yml @@ -13,17 +13,7 @@ steps: env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Download Electron and Playwright - - - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - sudo apt-get update - sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1 - sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb - sudo chmod +x /etc/init.d/xvfb - sudo update-rc.d xvfb defaults - sudo service xvfb start - displayName: Setup build environment + retryCountOnTaskFailure: 3 - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - script: | @@ -82,6 +72,7 @@ steps: compile-extension:github-authentication \ compile-extension:html-language-features-server \ compile-extension:ipynb \ + compile-extension:notebook-renderers \ compile-extension:json-language-features-server \ compile-extension:markdown-language-features-server \ compile-extension:markdown-language-features \ @@ -121,13 +112,13 @@ steps: INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \ ./scripts/test-integration.sh --build --tfs "Integration Tests" env: - VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH) displayName: Run integration tests (Electron) timeoutInMinutes: 20 - script: ./scripts/test-web-integration.sh --browser chromium env: - VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)-web displayName: Run integration tests (Browser, Chromium) timeoutInMinutes: 20 @@ -139,7 +130,7 @@ steps: INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \ ./scripts/test-remote-integration.sh env: - VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH) displayName: Run integration tests (Remote) timeoutInMinutes: 20 @@ -179,7 +170,7 @@ steps: - script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage" env: - VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)-web timeoutInMinutes: 20 displayName: Run smoke tests (Browser, Chromium) @@ -187,7 +178,7 @@ steps: set -e yarn gulp compile-extension:vscode-test-resolver APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) - VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \ + VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)" \ yarn smoketest-no-compile --tracing --remote --build "$APP_PATH" timeoutInMinutes: 20 displayName: Run smoke tests (Remote) diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index a3c47d8e15e..192cbb38905 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -41,15 +41,28 @@ steps: - script: tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz displayName: Extract compilation output - - script: | - set -e - # Start X server - /etc/init.d/xvfb start - # Start dbus session - DBUS_LAUNCH_RESULT=$(sudo dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address) - echo "##vso[task.setvariable variable=DBUS_SESSION_BUS_ADDRESS]$DBUS_LAUNCH_RESULT" - displayName: Setup system services - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) + - script: | + set -e + # Start X server + sudo apt-get update + sudo apt-get install -y pkg-config \ + libxss1 \ + dbus \ + xvfb \ + libgtk-3-0 \ + libgbm1 \ + libxkbfile-dev \ + libsecret-1-dev \ + libkrb5-dev + sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb + sudo chmod +x /etc/init.d/xvfb + sudo update-rc.d xvfb defaults + sudo service xvfb start + # Start dbus session + sudo mkdir -p /var/run/dbus + DBUS_LAUNCH_RESULT=$(sudo dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address) + echo "##vso[task.setvariable variable=DBUS_SESSION_BUS_ADDRESS]$DBUS_LAUNCH_RESULT" + displayName: Setup system services - script: node build/setup-npm-registry.js $NPM_REGISTRY condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) @@ -72,7 +85,10 @@ steps: - script: | set -e npm config set registry "$NPM_REGISTRY" --location=project - npm config set always-auth=true --location=project + # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb + # following is a workaround for yarn to send authorization header + # for GET requests to the registry. + echo "always-auth=true" >> .npmrc yarn config set registry "$NPM_REGISTRY" condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) displayName: Setup NPM & Yarn @@ -83,23 +99,6 @@ steps: condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) displayName: Setup NPM Authentication - # TODO@joaomoreno TODO@deepak1556 this should be part of the base image - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - if [ "$VSCODE_ARCH" = "x64" ]; then - OS=ubuntu - else - OS=debian - fi - - sudo apt-get update && sudo apt-get install -y ca-certificates curl gnupg - sudo mkdir -m 0755 -p /etc/apt/keyrings - curl -fsSL https://download.docker.com/linux/$OS/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg - echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/$OS "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - sudo apt update && sudo apt install -y docker-ce-cli - displayName: Install Docker client - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) - - ${{ if and(ne(parameters.VSCODE_QUALITY, 'oss'), or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.VSCODE_ARCH, 'arm64'))) }}: - task: Docker@1 displayName: "Pull Docker image" @@ -107,73 +106,69 @@ steps: azureSubscriptionEndpoint: "vscode-builds-subscription" azureContainerRegistry: vscodehub.azurecr.io command: "Run an image" - imageName: vscode-linux-build-agent:centos7-devtoolset8-${{ parameters.VSCODE_ARCH }} + imageName: vscode-linux-build-agent:centos7-devtoolset8-$(VSCODE_ARCH) containerCommand: uname condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) - - ${{ if and(ne(parameters.VSCODE_QUALITY, 'oss'), eq(parameters.VSCODE_ARCH, 'arm64')) }}: - - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - displayName: Register Docker QEMU - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['VSCODE_ARCH'], 'arm64')) - - - script: | - set -e - - for i in {1..5}; do # try 5 times - yarn --cwd build --frozen-lockfile --check-files && break - if [ $i -eq 3 ]; then - echo "Yarn failed too many times" >&2 - exit 1 - fi - echo "Yarn failed $i, trying again..." - done - - if [ -z "$CC" ] || [ -z "$CXX" ]; then - # Download clang based on chromium revision used by vscode - curl -s https://raw.githubusercontent.com/chromium/chromium/108.0.5359.215/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux - # Download libcxx headers and objects from upstream electron releases - DEBUG=libcxx-fetcher \ - VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \ - VSCODE_LIBCXX_HEADERS_DIR=$PWD/.build/libcxx_headers \ - VSCODE_LIBCXXABI_HEADERS_DIR=$PWD/.build/libcxxabi_headers \ - VSCODE_ARCH="$(NPM_ARCH)" \ - node build/linux/libcxx-fetcher.js - # Set compiler toolchain - # Flags for the client build are based on - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/108.0.5359.215:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/108.0.5359.215:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/108.0.5359.215:build/config/c++/BUILD.gn - export CC=$PWD/.build/CR_Clang/bin/clang - export CXX=$PWD/.build/CR_Clang/bin/clang++ - export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr" - export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -Wl,--lto-O0" - export VSCODE_REMOTE_CC=$(which gcc) - export VSCODE_REMOTE_CXX=$(which g++) - fi - - for i in {1..5}; do # try 5 times - yarn --frozen-lockfile --check-files && break - if [ $i -eq 3 ]; then - echo "Yarn failed too many times" >&2 - exit 1 - fi - echo "Yarn failed $i, trying again..." - done - env: - npm_config_arch: $(NPM_ARCH) - ELECTRON_SKIP_BINARY_DOWNLOAD: 1 - PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - GITHUB_TOKEN: "$(github-distro-mixin-password)" - ${{ if and(ne(parameters.VSCODE_QUALITY, 'oss'), or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.VSCODE_ARCH, 'arm64'))) }}: - VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME: vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-${{ parameters.VSCODE_ARCH }} - displayName: Install dependencies - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + + for i in {1..5}; do # try 5 times + yarn --cwd build --frozen-lockfile --check-files && break + if [ $i -eq 3 ]; then + echo "Yarn failed too many times" >&2 + exit 1 + fi + echo "Yarn failed $i, trying again..." + done + + docker run -e GITHUB_TOKEN -e npm_config_arch -e NPM_REGISTRY \ + -e VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME -e VSCODE_HOST_MOUNT \ + -e ELECTRON_SKIP_BINARY_DOWNLOAD -e PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD \ + -v /mnt/vss/_work/1/s:/home/builduser/vscode -v /mnt/vss/_work/1/s/.build/.netrc:/home/builduser/.netrc \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -u 1000:1000 \ + -w /home/builduser/vscode vscodehub.azurecr.io/vscode-linux-build-agent:bionic-$(VSCODE_ARCH) \ + /bin/bash -c "./build/azure-pipelines/linux/install.sh" + + sudo chown -R $USER:$USER /mnt/vss/_work/1/s + env: + npm_config_arch: $(NPM_ARCH) + NPM_REGISTRY: "$(NPM_REGISTRY)" + ELECTRON_SKIP_BINARY_DOWNLOAD: 1 + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 + GITHUB_TOKEN: "$(github-distro-mixin-password)" + VSCODE_HOST_MOUNT: "/mnt/vss/_work/1/s" + ${{ if or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.VSCODE_ARCH, 'arm64')) }}: + VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME: vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-$(VSCODE_ARCH) + displayName: Install dependencies + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - script: node build/azure-pipelines/distro/mixin-npm condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Mixin distro node modules + - ${{ else }}: + - script: | + set -e + + for i in {1..5}; do # try 5 times + yarn --frozen-lockfile --check-files && break + if [ $i -eq 3 ]; then + echo "Yarn failed too many times" >&2 + exit 1 + fi + echo "Yarn failed $i, trying again..." + done + env: + npm_config_arch: $(NPM_ARCH) + ELECTRON_SKIP_BINARY_DOWNLOAD: 1 + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Install dependencies + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - script: | set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt @@ -189,17 +184,59 @@ steps: - template: ../common/install-builtin-extensions.yml - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci + - script: | + set -e + yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci + ARCHIVE_PATH=".build/linux/client/code-${{ parameters.VSCODE_QUALITY }}-$(VSCODE_ARCH)-$(date +%s).tar.gz" + mkdir -p $(dirname $ARCHIVE_PATH) + echo "##vso[task.setvariable variable=CLIENT_PATH]$ARCHIVE_PATH" env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Build client - - script: yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci + - ${{ if ne(parameters.VSCODE_CIBUILD, true) }}: + - task: DownloadPipelineArtifact@2 + inputs: + artifact: $(ARTIFACT_PREFIX)vscode_cli_linux_$(VSCODE_ARCH)_cli + patterns: "**" + path: $(Build.ArtifactStagingDirectory)/cli + displayName: Download VS Code CLI + + - script: | + set -e + tar -xzvf $(Build.ArtifactStagingDirectory)/cli/*.tar.gz -C $(Build.ArtifactStagingDirectory)/cli + CLI_APP_NAME=$(node -p "require(\"$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/resources/app/product.json\").tunnelApplicationName") + APP_NAME=$(node -p "require(\"$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/resources/app/product.json\").applicationName") + mv $(Build.ArtifactStagingDirectory)/cli/$APP_NAME $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/bin/$CLI_APP_NAME + displayName: Mix in CLI + + - script: | + set -e + tar -czf $CLIENT_PATH -C .. VSCode-linux-$(VSCODE_ARCH) + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Archive client + + - script: | + set -e + yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci + mv ../vscode-reh-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH) # TODO@joaomoreno + ARCHIVE_PATH=".build/linux/server/vscode-server-linux-$(VSCODE_ARCH).tar.gz" + mkdir -p $(dirname $ARCHIVE_PATH) + tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-server-linux-$(VSCODE_ARCH) + echo "##vso[task.setvariable variable=SERVER_PATH]$ARCHIVE_PATH" env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Build server - - script: yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci + - script: | + set -e + yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci + mv ../vscode-reh-web-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH)-web # TODO@joaomoreno + ARCHIVE_PATH=".build/linux/web/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz" + mkdir -p $(dirname $ARCHIVE_PATH) + tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-server-linux-$(VSCODE_ARCH)-web + echo "##vso[task.setvariable variable=WEB_PATH]$ARCHIVE_PATH" env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Build server (web) @@ -219,28 +256,45 @@ steps: VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }} - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}: - - task: DownloadPipelineArtifact@2 - inputs: - artifact: vscode_cli_linux_$(VSCODE_ARCH)_cli - patterns: "**" - path: $(Build.ArtifactStagingDirectory)/cli - displayName: Download VS Code CLI + - script: | + set -e + docker run -v /mnt/vss/_work/1/s:/home/builduser/vscode \ + -v /mnt/vss/_work/1/s/.build/.netrc:/home/builduser/.netrc \ + -v /mnt/vss/_work/1/VSCode-linux-$(VSCODE_ARCH):/home/builduser/VSCode-linux-$(VSCODE_ARCH) \ + -u 1000:1000 \ + -w /home/builduser/vscode vscodehub.azurecr.io/vscode-linux-build-agent:bionic-$(VSCODE_ARCH) \ + yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-deb" + displayName: Prepare deb package + + - script: | + set -e + yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb" + echo "##vso[task.setvariable variable=DEB_PATH]$(ls .build/linux/deb/*/deb/*.deb)" + displayName: Build deb package + + - script: | + set -e + docker run -v /mnt/vss/_work/1/s:/home/builduser/vscode \ + -v /mnt/vss/_work/1/s/.build/.netrc:/home/builduser/.netrc \ + -v /mnt/vss/_work/1/VSCode-linux-$(VSCODE_ARCH):/home/builduser/VSCode-linux-$(VSCODE_ARCH) \ + -u 1000:1000 \ + -w /home/builduser/vscode vscodehub.azurecr.io/vscode-linux-build-agent:bionic-$(VSCODE_ARCH) \ + yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-rpm" + displayName: Prepare rpm package + + - script: | + set -e + yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm" + echo "##vso[task.setvariable variable=RPM_PATH]$(ls .build/linux/rpm/*/*.rpm)" + displayName: Build rpm package - script: | set -e - tar -xzvf $(Build.ArtifactStagingDirectory)/cli/*.tar.gz -C $(Build.ArtifactStagingDirectory)/cli - CLI_APP_NAME=$(node -p "require(\"$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/resources/app/product.json\").tunnelApplicationName") - APP_NAME=$(node -p "require(\"$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/resources/app/product.json\").applicationName") - mv $(Build.ArtifactStagingDirectory)/cli/$APP_NAME $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/bin/$CLI_APP_NAME - displayName: Make CLI executable - - - script: yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb" - displayName: Build deb package - - - script: yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm" - displayName: Build rpm package - - - script: yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap" + yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap" + ARCHIVE_PATH=".build/linux/snap-tarball/snap-$(VSCODE_ARCH).tar.gz" + mkdir -p $(dirname $ARCHIVE_PATH) + tar -czf $ARCHIVE_PATH -C .build/linux snap + echo "##vso[task.setvariable variable=SNAP_PATH]$ARCHIVE_PATH" displayName: Prepare snap package - task: UseDotNet@2 @@ -254,8 +308,9 @@ steps: - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll rpm $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/rpm '*.rpm' displayName: Codesign rpm - - script: ./build/azure-pipelines/linux/prepare-publish.sh - displayName: Prepare for Publish + - script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_" + condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')) + displayName: Generate artifact prefix - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: Generate SBOM (client) @@ -263,42 +318,47 @@ steps: BuildDropPath: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) PackageName: Visual Studio Code - - publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest - displayName: Publish SBOM (client) - artifact: vscode_client_linux_$(VSCODE_ARCH)_sbom - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: Generate SBOM (server) inputs: BuildDropPath: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH) PackageName: Visual Studio Code Server + - publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest + displayName: Publish SBOM (client) + artifact: $(ARTIFACT_PREFIX)sbom_vscode_client_linux_$(VSCODE_ARCH) + - publish: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)/_manifest displayName: Publish SBOM (server) - artifact: vscode_server_linux_$(VSCODE_ARCH)_sbom + artifact: $(ARTIFACT_PREFIX)sbom_vscode_server_linux_$(VSCODE_ARCH) + + - publish: $(CLIENT_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned + condition: and(succeededOrFailed(), ne(variables['CLIENT_PATH'], '')) + displayName: Publish client archive + + - publish: $(SERVER_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned + condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], '')) + displayName: Publish server archive + + - publish: $(WEB_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned + condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], '')) + displayName: Publish web server archive - publish: $(DEB_PATH) - artifact: vscode_client_linux_$(VSCODE_ARCH)_deb-package + artifact: $(ARTIFACT_PREFIX)vscode_client_linux_$(VSCODE_ARCH)_deb-package + condition: and(succeededOrFailed(), ne(variables['DEB_PATH'], '')) displayName: Publish deb package - publish: $(RPM_PATH) - artifact: vscode_client_linux_$(VSCODE_ARCH)_rpm-package + artifact: $(ARTIFACT_PREFIX)vscode_client_linux_$(VSCODE_ARCH)_rpm-package + condition: and(succeededOrFailed(), ne(variables['RPM_PATH'], '')) displayName: Publish rpm package - - publish: $(TARBALL_PATH) - artifact: vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned - displayName: Publish client archive + - publish: $(SNAP_PATH) + artifact: $(ARTIFACT_PREFIX)snap-$(VSCODE_ARCH) + condition: and(succeededOrFailed(), ne(variables['SNAP_PATH'], '')) + displayName: Publish snap pre-package - - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH).tar.gz - artifact: vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned - displayName: Publish server archive - - - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz - artifact: vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned - displayName: Publish web server archive - - - task: PublishPipelineArtifact@0 - displayName: "Publish Pipeline Artifact" - inputs: - artifactName: "snap-$(VSCODE_ARCH)" - targetPath: .build/linux/snap-tarball diff --git a/build/azure-pipelines/linux/snap-build-linux.yml b/build/azure-pipelines/linux/snap-build-linux.yml index 9002fcff5d7..c028cc58e04 100644 --- a/build/azure-pipelines/linux/snap-build-linux.yml +++ b/build/azure-pipelines/linux/snap-build-linux.yml @@ -27,15 +27,13 @@ steps: sudo apt-get install -y yarn # Define variables - REPO="$(pwd)" - SNAP_ROOT="$REPO/.build/linux/snap/$(VSCODE_ARCH)" + SNAP_ROOT="$(pwd)/.build/linux/snap/$(VSCODE_ARCH)" # Install build dependencies (cd build && yarn) # Unpack snap tarball artifact, in order to preserve file perms - SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$(VSCODE_ARCH).tar.gz" - (cd .build/linux && tar -xzf $SNAP_TARBALL_PATH) + (cd .build/linux && tar -xzf snap-tarball/snap-$(VSCODE_ARCH).tar.gz) # Create snap package BUILD_VERSION="$(date +%s)" diff --git a/build/azure-pipelines/oss/product-build-pr-cache-linux.yml b/build/azure-pipelines/oss/product-build-pr-cache-linux.yml index 97eba56abc3..97c5ddd78ff 100644 --- a/build/azure-pipelines/oss/product-build-pr-cache-linux.yml +++ b/build/azure-pipelines/oss/product-build-pr-cache-linux.yml @@ -39,6 +39,10 @@ steps: condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) displayName: Setup NPM Authentication + - script: sudo apt-get update && sudo apt-get install -y libkrb5-dev + displayName: Install build dependencies + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - script: | set -e for i in {1..5}; do # try 5 times diff --git a/build/azure-pipelines/product-build-pr.yml b/build/azure-pipelines/product-build-pr.yml index 789996060ec..90f85c5817f 100644 --- a/build/azure-pipelines/product-build-pr.yml +++ b/build/azure-pipelines/product-build-pr.yml @@ -105,6 +105,7 @@ jobs: - template: win32/product-build-win32.yml parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: true VSCODE_RUN_INTEGRATION_TESTS: false @@ -121,6 +122,7 @@ jobs: - template: win32/product-build-win32.yml parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: true @@ -137,6 +139,7 @@ jobs: # - template: win32/product-build-win32.yml # parameters: # VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + # VSCODE_ARCH: x64 # VSCODE_RUN_UNIT_TESTS: false # VSCODE_RUN_INTEGRATION_TESTS: false # VSCODE_RUN_SMOKE_TESTS: true diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml index 5be7f43abf1..2d4ad8aa84a 100644 --- a/build/azure-pipelines/product-build.yml +++ b/build/azure-pipelines/product-build.yml @@ -118,6 +118,8 @@ variables: value: ${{ eq(parameters.VSCODE_PUBLISH_TO_MOONCAKE, true) }} - name: VSCODE_SCHEDULEDBUILD value: ${{ eq(variables['Build.Reason'], 'Schedule') }} + - name: VSCODE_7PM_BUILD + value: ${{ in(variables['Build.Reason'], 'BuildCompletion', 'ResourceTrigger') }} - name: VSCODE_STEP_ON_IT value: ${{ eq(parameters.VSCODE_STEP_ON_IT, true) }} - name: VSCODE_BUILD_MACOS_UNIVERSAL @@ -134,26 +136,20 @@ variables: value: true - name: Codeql.SkipTaskAutoInjection value: true + - name: ARTIFACT_PREFIX + value: '' name: "$(Date:yyyyMMdd).$(Rev:r) (${{ parameters.VSCODE_QUALITY }})" resources: containers: - - container: vscode-bionic-x64 - image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic-x64 - endpoint: VSCodeHub - options: --user 0:0 --cap-add SYS_ADMIN - - container: vscode-arm64 - image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-arm64 - endpoint: VSCodeHub - options: --user 0:0 --cap-add SYS_ADMIN - - container: vscode-armhf - image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-armhf - endpoint: VSCodeHub - options: --user 0:0 --cap-add SYS_ADMIN - container: snapcraft image: vscodehub.azurecr.io/vscode-linux-build-agent:snapcraft-x64 endpoint: VSCodeHub + pipelines: + - pipeline: vscode-7pm-kick-off + source: 'VS Code 7PM Kick-Off' + trigger: true stages: - stage: Compile @@ -176,6 +172,7 @@ stages: steps: - template: ./linux/cli-build-linux.yml parameters: + VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }} VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} VSCODE_BUILD_LINUX: ${{ parameters.VSCODE_BUILD_LINUX }} @@ -216,6 +213,7 @@ stages: steps: - template: ./darwin/cli-build-darwin.yml parameters: + VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }} VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} VSCODE_BUILD_MACOS: ${{ parameters.VSCODE_BUILD_MACOS }} @@ -235,6 +233,7 @@ stages: steps: - template: ./win32/cli-build-win32.yml parameters: + VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }} VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} VSCODE_BUILD_WIN32: ${{ parameters.VSCODE_BUILD_WIN32 }} @@ -273,6 +272,7 @@ stages: - template: win32/product-build-win32.yml parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: true VSCODE_RUN_INTEGRATION_TESTS: false @@ -286,6 +286,7 @@ stages: - template: win32/product-build-win32.yml parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: true @@ -299,6 +300,7 @@ stages: - template: win32/product-build-win32.yml parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: false @@ -313,6 +315,7 @@ stages: - template: win32/product-build-win32.yml parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_ARCH: x64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} @@ -336,10 +339,11 @@ stages: - template: win32/product-build-win32.yml parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_ARCH: ia32 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} - VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} - VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} - VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} + VSCODE_RUN_UNIT_TESTS: true + VSCODE_RUN_INTEGRATION_TESTS: true + VSCODE_RUN_SMOKE_TESTS: true - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}: - job: WindowsARM64 @@ -350,6 +354,7 @@ stages: - template: win32/product-build-win32.yml parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_ARCH: arm64 VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }} VSCODE_RUN_UNIT_TESTS: false VSCODE_RUN_INTEGRATION_TESTS: false @@ -365,7 +370,6 @@ stages: - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}: - job: Linuxx64UnitTest displayName: Unit Tests - container: vscode-bionic-x64 variables: VSCODE_ARCH: x64 NPM_ARCH: x64 @@ -381,7 +385,6 @@ stages: VSCODE_RUN_SMOKE_TESTS: false - job: Linuxx64IntegrationTest displayName: Integration Tests - container: vscode-bionic-x64 variables: VSCODE_ARCH: x64 NPM_ARCH: x64 @@ -397,7 +400,6 @@ stages: VSCODE_RUN_SMOKE_TESTS: false - job: Linuxx64SmokeTest displayName: Smoke Tests - container: vscode-bionic-x64 variables: VSCODE_ARCH: x64 NPM_ARCH: x64 @@ -414,7 +416,6 @@ stages: - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX, true)) }}: - job: Linuxx64 - container: vscode-bionic-x64 variables: VSCODE_ARCH: x64 NPM_ARCH: x64 @@ -441,7 +442,6 @@ stages: - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true)) }}: - job: LinuxArmhf - container: vscode-armhf variables: VSCODE_ARCH: armhf NPM_ARCH: arm @@ -457,7 +457,6 @@ stages: - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}: - job: LinuxArm64 - container: vscode-arm64 variables: VSCODE_ARCH: arm64 NPM_ARCH: arm64 @@ -482,6 +481,7 @@ stages: - job: LinuxAlpine variables: VSCODE_ARCH: x64 + NPM_ARCH: x64 steps: - template: alpine/product-build-alpine.yml @@ -490,6 +490,7 @@ stages: timeoutInMinutes: 120 variables: VSCODE_ARCH: arm64 + NPM_ARCH: arm64 steps: - template: alpine/product-build-alpine.yml diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml index 94a48b43255..d8385278474 100644 --- a/build/azure-pipelines/product-compile.yml +++ b/build/azure-pipelines/product-compile.yml @@ -49,7 +49,7 @@ steps: condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) displayName: Setup NPM Authentication - - script: sudo apt update -y && sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libsecret-1-dev libnotify-bin + - script: sudo apt update -y && sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libsecret-1-dev libnotify-bin libkrb5-dev displayName: Install build tools condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) @@ -93,10 +93,16 @@ steps: - template: common/install-builtin-extensions.yml - - script: yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check - env: - GITHUB_TOKEN: "$(github-distro-mixin-password)" - displayName: Compile & Hygiene + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - script: yarn npm-run-all -lp core-ci-pr extensions-ci-pr hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Compile & Hygiene + - ${{ else }}: + - script: yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Compile & Hygiene - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - script: | diff --git a/build/azure-pipelines/product-publish.ps1 b/build/azure-pipelines/product-publish.ps1 index a9170d54f5c..fa4bf1aa31e 100644 --- a/build/azure-pipelines/product-publish.ps1 +++ b/build/azure-pipelines/product-publish.ps1 @@ -60,6 +60,7 @@ do { $artifacts | ForEach-Object { $artifactName = $_.name + if($set.Add($artifactName)) { Write-Host "Processing artifact: '$artifactName. Downloading from: $($_.resource.downloadUrl)" @@ -98,8 +99,11 @@ do { } | Format-Table exec { node build/azure-pipelines/common/createAsset.js $product $os $arch $type $asset.Name $asset.FullName } - $artifactName >> $ARTIFACT_PROCESSED_FILE_PATH } + + # Mark the artifact as processed. Make sure to keep the previously + # processed artifacts in the file as well, not just from this run. + $artifactName >> $ARTIFACT_PROCESSED_FILE_PATH } # Get the timeline and see if it says the other stage completed diff --git a/build/azure-pipelines/upload-configuration.ts b/build/azure-pipelines/upload-configuration.ts deleted file mode 100644 index 596dac701e4..00000000000 --- a/build/azure-pipelines/upload-configuration.ts +++ /dev/null @@ -1,129 +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 * as path from 'path'; -import * as os from 'os'; -import * as cp from 'child_process'; -import * as vfs from 'vinyl-fs'; -import * as util from '../lib/util'; -import { ClientSecretCredential } from '@azure/identity'; -const azure = require('gulp-azure-storage'); -import * as packageJson from '../../package.json'; - -const commit = process.env['BUILD_SOURCEVERSION']; - -function generateVSCodeConfigurationTask(): Promise { - return new Promise((resolve, reject) => { - const buildDir = process.env['AGENT_BUILDDIRECTORY']; - if (!buildDir) { - return reject(new Error('$AGENT_BUILDDIRECTORY not set')); - } - - if (!shouldSetupSettingsSearch()) { - console.log(`Only runs on main and release branches, not ${process.env.BUILD_SOURCEBRANCH}`); - return resolve(undefined); - } - - if (process.env.VSCODE_QUALITY !== 'insider' && process.env.VSCODE_QUALITY !== 'stable') { - console.log(`Only runs on insider and stable qualities, not ${process.env.VSCODE_QUALITY}`); - return resolve(undefined); - } - - const result = path.join(os.tmpdir(), 'configuration.json'); - const userDataDir = path.join(os.tmpdir(), 'tmpuserdata'); - const extensionsDir = path.join(os.tmpdir(), 'tmpextdir'); - const arch = process.env['VSCODE_ARCH']; - const appRoot = path.join(buildDir, `VSCode-darwin-${arch}`); - const appName = process.env.VSCODE_QUALITY === 'insider' ? 'Visual\\ Studio\\ Code\\ -\\ Insiders.app' : 'Visual\\ Studio\\ Code.app'; - const appPath = path.join(appRoot, appName, 'Contents', 'Resources', 'app', 'bin', 'code'); - const codeProc = cp.exec( - `${appPath} --export-default-configuration='${result}' --wait --user-data-dir='${userDataDir}' --extensions-dir='${extensionsDir}'`, - (err, stdout, stderr) => { - clearTimeout(timer); - if (err) { - console.log(`err: ${err} ${err.message} ${err.toString()}`); - reject(err); - } - - if (stdout) { - console.log(`stdout: ${stdout}`); - } - - if (stderr) { - console.log(`stderr: ${stderr}`); - } - - resolve(result); - } - ); - const timer = setTimeout(() => { - codeProc.kill(); - reject(new Error('export-default-configuration process timed out')); - }, 60 * 1000); - - codeProc.on('error', err => { - clearTimeout(timer); - reject(err); - }); - }); -} - -export function shouldSetupSettingsSearch(): boolean { - const branch = process.env.BUILD_SOURCEBRANCH; - return !!(branch && (/\/main$/.test(branch) || branch.indexOf('/release/') >= 0)); -} - -export function getSettingsSearchBuildId(packageJson: { version: string }) { - try { - const branch = process.env.BUILD_SOURCEBRANCH!; - const branchId = branch.indexOf('/release/') >= 0 ? 0 : - /\/main$/.test(branch) ? 1 : - 2; // Some unexpected branch - - const out = cp.execSync(`git rev-list HEAD --count`); - const count = parseInt(out.toString()); - - // - // 1.25.1, 1,234,567 commits, main = 1250112345671 - return util.versionStringToNumber(packageJson.version) * 1e8 + count * 10 + branchId; - } catch (e) { - throw new Error('Could not determine build number: ' + e.toString()); - } -} - -async function main(): Promise { - const configPath = await generateVSCodeConfigurationTask(); - - if (!configPath) { - return; - } - - const settingsSearchBuildId = getSettingsSearchBuildId(packageJson); - - if (!settingsSearchBuildId) { - throw new Error('Failed to compute build number'); - } - - const credential = new ClientSecretCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, process.env['AZURE_CLIENT_SECRET']!); - - return new Promise((c, e) => { - vfs.src(configPath) - .pipe(azure.upload({ - account: process.env.AZURE_STORAGE_ACCOUNT, - credential, - container: 'configuration', - prefix: `${settingsSearchBuildId}/${commit}/` - })) - .on('end', () => c()) - .on('error', (err: any) => e(err)); - }); -} - -if (require.main === module) { - main().catch(err => { - console.error(err); - process.exit(1); - }); -} diff --git a/build/azure-pipelines/upload-sourcemaps.js b/build/azure-pipelines/upload-sourcemaps.js index 6e6eee1542d..6dba100a7cf 100644 --- a/build/azure-pipelines/upload-sourcemaps.js +++ b/build/azure-pipelines/upload-sourcemaps.js @@ -33,7 +33,8 @@ function main() { const productionDependencies = deps.getProductionDependencies(root); const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`); const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' }) - .pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore'))); + .pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore'))) + .pipe(util.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`))); sources.push(nodeModules); const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' }); sources.push(extensionsOut); @@ -62,4 +63,4 @@ main().catch(err => { console.error(err); process.exit(1); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLXNvdXJjZW1hcHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ1cGxvYWQtc291cmNlbWFwcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLDZCQUE2QjtBQUM3QixtQ0FBbUM7QUFFbkMsZ0NBQWdDO0FBQ2hDLG9DQUFvQztBQUNwQyxhQUFhO0FBQ2IsNENBQTRDO0FBQzVDLDhDQUF5RDtBQUN6RCxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUU1QyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztBQUNuRCxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLENBQUM7QUFDbEQsTUFBTSxVQUFVLEdBQUcsSUFBSSxpQ0FBc0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUUsQ0FBQyxDQUFDO0FBRXJKLDJEQUEyRDtBQUMzRCxNQUFNLENBQUMsRUFBRSxBQUFELEVBQUcsSUFBSSxFQUFFLElBQUksQ0FBQyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7QUFFdEMsU0FBUyxHQUFHLENBQUMsSUFBWSxFQUFFLElBQUksR0FBRyxHQUFHLElBQUksV0FBVztJQUNuRCxPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUM7U0FDNUIsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFRLEVBQUUsRUFBRTtRQUM3QixDQUFDLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQyxDQUFDLElBQUksU0FBUyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDeEMsT0FBTyxDQUFDLENBQUM7SUFDVixDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ04sQ0FBQztBQUVELFNBQVMsSUFBSTtJQUNaLE1BQU0sT0FBTyxHQUFVLEVBQUUsQ0FBQztJQUUxQiwrQkFBK0I7SUFDL0IsSUFBSSxDQUFDLElBQUksRUFBRTtRQUNWLE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsMEJBQTBCO1FBQzVELE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFakIsTUFBTSxzQkFBc0IsR0FBc0QsSUFBSSxDQUFDLHlCQUF5QixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZILE1BQU0seUJBQXlCLEdBQUcsc0JBQXNCLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQzNILE1BQU0sV0FBVyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMseUJBQXlCLEVBQUUsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLENBQUM7YUFDbkUsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3pFLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7UUFFMUIsTUFBTSxhQUFhLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLCtCQUErQixFQUFFLHFCQUFxQixDQUFDLEVBQUUsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUM1RyxPQUFPLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0tBQzVCO0lBRUQsNEJBQTRCO1NBQ3ZCO1FBQ0osT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7S0FDOUI7SUFFRCxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQzNCLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxPQUFPLENBQUM7YUFDbEIsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsVUFBVSxJQUFXO1lBQ3JDLE9BQU8sQ0FBQyxHQUFHLENBQUMscUJBQXFCLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUTtZQUMzRCxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUN6QixDQUFDLENBQUMsQ0FBQzthQUNGLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDO1lBQ2xCLE9BQU8sRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQjtZQUMxQyxVQUFVO1lBQ1YsU0FBUyxFQUFFLFlBQVk7WUFDdkIsTUFBTSxFQUFFLE1BQU0sR0FBRyxHQUFHO1NBQ3BCLENBQUMsQ0FBQzthQUNGLEVBQUUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUM7YUFDcEIsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLEdBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDckMsQ0FBQyxDQUFDLENBQUM7QUFDSixDQUFDO0FBRUQsSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFO0lBQ2xCLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbkIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNqQixDQUFDLENBQUMsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLXNvdXJjZW1hcHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ1cGxvYWQtc291cmNlbWFwcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLDZCQUE2QjtBQUM3QixtQ0FBbUM7QUFFbkMsZ0NBQWdDO0FBQ2hDLG9DQUFvQztBQUNwQyxhQUFhO0FBQ2IsNENBQTRDO0FBQzVDLDhDQUF5RDtBQUN6RCxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUU1QyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztBQUNuRCxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLENBQUM7QUFDbEQsTUFBTSxVQUFVLEdBQUcsSUFBSSxpQ0FBc0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUUsQ0FBQyxDQUFDO0FBRXJKLDJEQUEyRDtBQUMzRCxNQUFNLENBQUMsRUFBRSxBQUFELEVBQUcsSUFBSSxFQUFFLElBQUksQ0FBQyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7QUFFdEMsU0FBUyxHQUFHLENBQUMsSUFBWSxFQUFFLElBQUksR0FBRyxHQUFHLElBQUksV0FBVztJQUNuRCxPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUM7U0FDNUIsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFRLEVBQUUsRUFBRTtRQUM3QixDQUFDLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQyxDQUFDLElBQUksU0FBUyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDeEMsT0FBTyxDQUFDLENBQUM7SUFDVixDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ04sQ0FBQztBQUVELFNBQVMsSUFBSTtJQUNaLE1BQU0sT0FBTyxHQUFVLEVBQUUsQ0FBQztJQUUxQiwrQkFBK0I7SUFDL0IsSUFBSSxDQUFDLElBQUksRUFBRTtRQUNWLE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsMEJBQTBCO1FBQzVELE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFakIsTUFBTSxzQkFBc0IsR0FBc0QsSUFBSSxDQUFDLHlCQUF5QixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZILE1BQU0seUJBQXlCLEdBQUcsc0JBQXNCLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQzNILE1BQU0sV0FBVyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMseUJBQXlCLEVBQUUsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLENBQUM7YUFDbkUsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsZUFBZSxDQUFDLENBQUMsQ0FBQzthQUN0RSxJQUFJLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzdGLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7UUFFMUIsTUFBTSxhQUFhLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLCtCQUErQixFQUFFLHFCQUFxQixDQUFDLEVBQUUsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUM1RyxPQUFPLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0tBQzVCO0lBRUQsNEJBQTRCO1NBQ3ZCO1FBQ0osT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7S0FDOUI7SUFFRCxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQzNCLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxPQUFPLENBQUM7YUFDbEIsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsVUFBVSxJQUFXO1lBQ3JDLE9BQU8sQ0FBQyxHQUFHLENBQUMscUJBQXFCLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUTtZQUMzRCxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUN6QixDQUFDLENBQUMsQ0FBQzthQUNGLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDO1lBQ2xCLE9BQU8sRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQjtZQUMxQyxVQUFVO1lBQ1YsU0FBUyxFQUFFLFlBQVk7WUFDdkIsTUFBTSxFQUFFLE1BQU0sR0FBRyxHQUFHO1NBQ3BCLENBQUMsQ0FBQzthQUNGLEVBQUUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUM7YUFDcEIsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLEdBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDckMsQ0FBQyxDQUFDLENBQUM7QUFDSixDQUFDO0FBRUQsSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFO0lBQ2xCLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbkIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNqQixDQUFDLENBQUMsQ0FBQyJ9 \ No newline at end of file diff --git a/build/azure-pipelines/upload-sourcemaps.ts b/build/azure-pipelines/upload-sourcemaps.ts index fb90f31977b..366ad945499 100644 --- a/build/azure-pipelines/upload-sourcemaps.ts +++ b/build/azure-pipelines/upload-sourcemaps.ts @@ -39,7 +39,8 @@ function main(): Promise { const productionDependencies: { name: string; path: string; version: string }[] = deps.getProductionDependencies(root); const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`); const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' }) - .pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore'))); + .pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore'))) + .pipe(util.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`))); sources.push(nodeModules); const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' }); diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml index 556f1f23efa..95d1b6afefd 100644 --- a/build/azure-pipelines/web/product-build-web.yml +++ b/build/azure-pipelines/web/product-build-web.yml @@ -53,6 +53,10 @@ steps: condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) displayName: Setup NPM Authentication + - script: sudo apt-get update && sudo apt-get install -y libkrb5-dev + displayName: Install build dependencies + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - script: | set -e for i in {1..5}; do # try 5 times @@ -87,7 +91,13 @@ steps: - template: ../common/install-builtin-extensions.yml - - script: yarn gulp vscode-web-min-ci + - script: | + set -e + yarn gulp vscode-web-min-ci + ARCHIVE_PATH=".build/web/vscode-web.tar.gz" + mkdir -p $(dirname $ARCHIVE_PATH) + tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-web + echo "##vso[task.setvariable variable=WEB_PATH]$ARCHIVE_PATH" env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Build @@ -133,20 +143,11 @@ steps: node build/azure-pipelines/upload-nlsmetadata displayName: Upload NLS Metadata - - script: | - set -e - REPO="$(pwd)" - ROOT="$REPO/.." + - script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_" + condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')) + displayName: Generate artifact prefix - WEB_BUILD_NAME="vscode-web" - WEB_TARBALL_FILENAME="vscode-web.tar.gz" - WEB_TARBALL_PATH="$ROOT/$WEB_TARBALL_FILENAME" - - rm -rf $ROOT/vscode-web.tar.* - - cd $ROOT && tar --owner=0 --group=0 -czf $WEB_TARBALL_PATH $WEB_BUILD_NAME - displayName: Prepare for publish - - - publish: $(Agent.BuildDirectory)/vscode-web.tar.gz - artifact: vscode_web_linux_standalone_archive-unsigned + - publish: $(WEB_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_web_linux_standalone_archive-unsigned + condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], '')) displayName: Publish web archive diff --git a/build/azure-pipelines/win32/cli-build-win32.yml b/build/azure-pipelines/win32/cli-build-win32.yml index 797350df702..9a155a0c0be 100644 --- a/build/azure-pipelines/win32/cli-build-win32.yml +++ b/build/azure-pipelines/win32/cli-build-win32.yml @@ -8,6 +8,9 @@ parameters: - name: VSCODE_BUILD_WIN32_ARM64 type: boolean default: false + - name: VSCODE_CHECK_ONLY + type: boolean + default: false - name: VSCODE_QUALITY type: string @@ -17,22 +20,20 @@ steps: versionSpec: "16.x" - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - template: ../distro/download-distro.yml - - pwsh: node build/azure-pipelines/distro/apply-cli-patches - displayName: Apply distro patches + - template: ../cli/cli-apply-patches.yml - task: Npm@1 displayName: Download openssl prebuilt inputs: command: custom - customCommand: pack @vscode-internal/openssl-prebuilt@0.0.5 + customCommand: pack @vscode-internal/openssl-prebuilt@0.0.8 customRegistry: useFeed customFeed: "Monaco/openssl-prebuilt" workingDir: $(Build.ArtifactStagingDirectory) - powershell: | mkdir $(Build.ArtifactStagingDirectory)/openssl - tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl + tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.8.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl displayName: Extract openssl prebuilt - powershell: node build/azure-pipelines/cli/prepare.js @@ -57,6 +58,7 @@ steps: parameters: VSCODE_CLI_TARGET: x86_64-pc-windows-msvc VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_win32_x64_cli + VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }} VSCODE_CLI_ENV: OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-windows-static-md/lib OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-windows-static-md/include @@ -67,6 +69,7 @@ steps: parameters: VSCODE_CLI_TARGET: aarch64-pc-windows-msvc VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_win32_arm64_cli + VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }} VSCODE_CLI_ENV: OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-windows-static-md/lib OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-windows-static-md/include @@ -77,6 +80,7 @@ steps: parameters: VSCODE_CLI_TARGET: i686-pc-windows-msvc VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_win32_ia32_cli + VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }} VSCODE_CLI_ENV: OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x86-windows-static-md/lib OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x86-windows-static-md/include diff --git a/build/azure-pipelines/win32/prepare-publish.ps1 b/build/azure-pipelines/win32/prepare-publish.ps1 deleted file mode 100644 index d2870fe7871..00000000000 --- a/build/azure-pipelines/win32/prepare-publish.ps1 +++ /dev/null @@ -1,40 +0,0 @@ -. build/azure-pipelines/win32/exec.ps1 -$ErrorActionPreference = "Stop" - -$Arch = "$env:VSCODE_ARCH" -$Repo = "$(pwd)" -$Root = "$Repo\.." -$SystemExe = "$Repo\.build\win32-$Arch\system-setup\VSCodeSetup.exe" -$UserExe = "$Repo\.build\win32-$Arch\user-setup\VSCodeSetup.exe" -$Zip = "$Repo\.build\win32-$Arch\archive\VSCode-win32-$Arch.zip" -$LegacyServer = "$Root\vscode-reh-win32-$Arch" -$Server = "$Root\vscode-server-win32-$Arch" -$ServerZip = "$Repo\.build\vscode-server-win32-$Arch.zip" -$LegacyWeb = "$Root\vscode-reh-web-win32-$Arch" -$Web = "$Root\vscode-server-win32-$Arch-web" -$WebZip = "$Repo\.build\vscode-server-win32-$Arch-web.zip" -$Build = "$Root\VSCode-win32-$Arch" - -# Create server archive -if ("$Arch" -ne "arm64") { - exec { xcopy $LegacyServer $Server /H /E /I } - exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r } - exec { xcopy $LegacyWeb $Web /H /E /I } - exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $WebZip $Web -r } -} - -# get version -$PackageJson = Get-Content -Raw -Path "$Build\resources\app\package.json" | ConvertFrom-Json -$Version = $PackageJson.version - -$ARCHIVE_NAME = "VSCode-win32-$Arch-$Version.zip" -$SYSTEM_SETUP_NAME = "VSCodeSetup-$Arch-$Version.exe" -$USER_SETUP_NAME = "VSCodeUserSetup-$Arch-$Version.exe" - -# Set variables for upload -Move-Item $Zip "$Repo\.build\win32-$Arch\archive\$ARCHIVE_NAME" -Write-Host "##vso[task.setvariable variable=ARCHIVE_NAME]$ARCHIVE_NAME" -Move-Item $SystemExe "$Repo\.build\win32-$Arch\system-setup\$SYSTEM_SETUP_NAME" -Write-Host "##vso[task.setvariable variable=SYSTEM_SETUP_NAME]$SYSTEM_SETUP_NAME" -Move-Item $UserExe "$Repo\.build\win32-$Arch\user-setup\$USER_SETUP_NAME" -Write-Host "##vso[task.setvariable variable=USER_SETUP_NAME]$USER_SETUP_NAME" diff --git a/build/azure-pipelines/win32/product-build-win32-test.yml b/build/azure-pipelines/win32/product-build-win32-test.yml index 19d5e8feace..3a24e95657a 100644 --- a/build/azure-pipelines/win32/product-build-win32-test.yml +++ b/build/azure-pipelines/win32/product-build-win32-test.yml @@ -1,6 +1,8 @@ parameters: - name: VSCODE_QUALITY type: string + - name: VSCODE_ARCH + type: string - name: VSCODE_RUN_UNIT_TESTS type: boolean - name: VSCODE_RUN_INTEGRATION_TESTS @@ -13,6 +15,7 @@ steps: env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Download Electron and Playwright + retryCountOnTaskFailure: 3 - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: @@ -32,14 +35,17 @@ steps: - powershell: .\scripts\test.bat --build --tfs "Unit Tests" displayName: Run unit tests (Electron) timeoutInMinutes: 15 + continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }} - powershell: yarn test-node --build displayName: Run unit tests (node.js) timeoutInMinutes: 15 + continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }} - powershell: yarn test-browser-no-install --sequential --build --browser chromium --tfs "Browser Unit Tests" displayName: Run unit tests (Browser, Chromium) timeoutInMinutes: 20 + continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }} - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - powershell: | @@ -53,6 +59,7 @@ steps: compile-extension:github-authentication ` compile-extension:html-language-features-server ` compile-extension:ipynb ` + compile-extension:notebook-renderers ` compile-extension:json-language-features-server ` compile-extension:markdown-language-features-server ` compile-extension:markdown-language-features ` @@ -88,16 +95,21 @@ steps: $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json $AppNameShort = $AppProductJson.nameShort - exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-integration.bat --build --tfs "Integration Tests" } + $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe" + $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)" + exec { .\scripts\test-integration.bat --build --tfs "Integration Tests" } displayName: Run integration tests (Electron) timeoutInMinutes: 20 + continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }} - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" - exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\scripts\test-web-integration.bat --browser firefox } + $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)-web" + exec { .\scripts\test-web-integration.bat --browser firefox } displayName: Run integration tests (Browser, Firefox) timeoutInMinutes: 20 + continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }} - powershell: | . build/azure-pipelines/win32/exec.ps1 @@ -105,9 +117,12 @@ steps: $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json $AppNameShort = $AppProductJson.nameShort - exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-remote-integration.bat } + $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe" + $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)" + exec { .\scripts\test-remote-integration.bat } displayName: Run integration tests (Remote) timeoutInMinutes: 20 + continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }} - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - powershell: .\build\azure-pipelines\win32\listprocesses.bat @@ -130,12 +145,14 @@ steps: - powershell: yarn smoketest-no-compile --tracing --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" displayName: Run smoke tests (Electron) timeoutInMinutes: 20 + continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }} - powershell: yarn smoketest-no-compile --web --tracing --headless env: - VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)-web displayName: Run smoke tests (Browser, Chromium) timeoutInMinutes: 20 + continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }} - powershell: yarn gulp compile-extension:vscode-test-resolver displayName: Compile test resolver extension @@ -143,9 +160,10 @@ steps: - powershell: yarn smoketest-no-compile --tracing --remote --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" env: - VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH) displayName: Run smoke tests (Remote) timeoutInMinutes: 20 + continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }} - powershell: .\build\azure-pipelines\win32\listprocesses.bat displayName: Diagnostics after smoke test run diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index ab985554bb7..6060ef2e6cb 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -1,6 +1,8 @@ parameters: - name: VSCODE_QUALITY type: string + - name: VSCODE_ARCH + type: string - name: VSCODE_CIBUILD type: boolean - name: VSCODE_RUN_UNIT_TESTS @@ -92,9 +94,12 @@ steps: $ErrorActionPreference = "Stop" # TODO: Should be replaced with upstream URL once https://github.com/nodejs/node-gyp/pull/2825 # gets merged. - exec { git clone https://github.com/rzhao271/node-gyp.git . } "Cloning rzhao271/node-gyp failed" - exec { git checkout 102b347da0c92c29f9c67df22e864e70249cf086 } "Checking out 102b347 failed" - exec { npm install } "Building rzhao271/node-gyp failed" + exec { git config --global user.email "vscode@microsoft.com" } "git config user.email failed" + exec { git config --global user.name "VSCode" } "git config user.name failed" + exec { git clone https://github.com/nodejs/node-gyp.git . } "Cloning nodejs/node-gyp failed" + exec { git checkout v9.4.0 } "Checking out v9.4.0 failed" + exec { git am --3way --whitespace=fix ../../build/npm/gyp/patches/gyp_spectre_mitigation_support.patch } "Apply spectre patch failed" + exec { npm install } "Building node-gyp failed" displayName: Install custom node-gyp workingDirectory: .build/node-gyp condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) @@ -134,7 +139,7 @@ steps: - template: ../common/install-builtin-extensions.yml - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}: - powershell: node build\lib\policies displayName: Generate Group Policy definitions retryCountOnTaskFailure: 3 @@ -146,7 +151,7 @@ steps: displayName: Transpile - ${{ else }}: - - ${{ if eq(parameters.VSCODE_QUALITY, 'insider') }}: + - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), eq(parameters.VSCODE_QUALITY, 'insider')) }}: - powershell: node build/win32/explorer-appx-fetcher .build/win32/appx displayName: Download Explorer Sparse Package @@ -154,31 +159,41 @@ steps: . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" } + exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" } + echo "##vso[task.setvariable variable=BUILT_CLIENT]true" echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)" env: GITHUB_TOKEN: "$(github-distro-mixin-password)" - displayName: Build - - - powershell: yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" - env: - GITHUB_TOKEN: "$(github-distro-mixin-password)" - displayName: Prepare Setup Package + displayName: Build client - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" exec { yarn gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" } - exec { yarn gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" } - echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(agent.builddirectory)/vscode-reh-win32-$(VSCODE_ARCH)" + mv ..\vscode-reh-win32-$(VSCODE_ARCH) ..\vscode-server-win32-$(VSCODE_ARCH) # TODO@joaomoreno + echo "##vso[task.setvariable variable=BUILT_SERVER]true" + echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)" env: GITHUB_TOKEN: "$(github-distro-mixin-password)" - displayName: Build Servers + displayName: Build server + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { yarn gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" } + mv ..\vscode-reh-web-win32-$(VSCODE_ARCH) ..\vscode-server-win32-$(VSCODE_ARCH)-web # TODO@joaomoreno + echo "##vso[task.setvariable variable=BUILT_WEB]true" + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Build server (web) condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: - template: product-build-win32-test.yml parameters: VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }} + VSCODE_ARCH: ${{ parameters.VSCODE_ARCH }} VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }} VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }} VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }} @@ -229,8 +244,42 @@ steps: displayName: Codesign context menu appx package - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: yarn gulp "vscode-win32-$(VSCODE_ARCH)-archive" - displayName: Package archive + - powershell: | + $PackageJson = Get-Content -Raw -Path ..\VSCode-win32-$(VSCODE_ARCH)\resources\app\package.json | ConvertFrom-Json + $Version = $PackageJson.version + echo "##vso[task.setvariable variable=VSCODE_VERSION]$Version" + condition: succeededOrFailed() + displayName: Get product version + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $ArchivePath = ".build\win32-$(VSCODE_ARCH)\VSCode-win32-$(VSCODE_ARCH)-$(VSCODE_VERSION).zip" + New-Item -ItemType Directory -Path .build\win32-$(VSCODE_ARCH) -Force + exec { 7z.exe a -tzip $ArchivePath -x!CodeSignSummary*.md ..\VSCode-win32-$(VSCODE_ARCH)\* -r } + echo "##vso[task.setvariable variable=CLIENT_PATH]$ArchivePath" + condition: and(succeededOrFailed(), eq(variables['BUILT_CLIENT'], 'true')) + displayName: Package client + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $ArchivePath = ".build\win32-$(VSCODE_ARCH)\vscode-server-win32-$(VSCODE_ARCH).zip" + New-Item -ItemType Directory -Path .build\win32-$(VSCODE_ARCH) -Force + exec { 7z.exe a -tzip $ArchivePath ..\vscode-server-win32-$(VSCODE_ARCH) -r } + echo "##vso[task.setvariable variable=SERVER_PATH]$ArchivePath" + condition: and(succeededOrFailed(), eq(variables['BUILT_SERVER'], 'true')) + displayName: Package server + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $ArchivePath = ".build\win32-$(VSCODE_ARCH)\vscode-server-win32-$(VSCODE_ARCH)-web.zip" + New-Item -ItemType Directory -Path .build\win32-$(VSCODE_ARCH) -Force + exec { 7z.exe a -tzip $ArchivePath ..\vscode-server-win32-$(VSCODE_ARCH)-web -r } + echo "##vso[task.setvariable variable=WEB_PATH]$ArchivePath" + condition: and(succeededOrFailed(), eq(variables['BUILT_WEB'], 'true')) + displayName: Package server (web) - powershell: | . build/azure-pipelines/win32/exec.ps1 @@ -239,11 +288,26 @@ steps: $env:ESRPAADUsername = "$(esrp-aad-username)" $env:ESRPAADPassword = "$(esrp-aad-password)" exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-system-setup" --sign } - exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign } - displayName: Package setups + $SetupPath = ".build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup-$(VSCODE_ARCH)-$(VSCODE_VERSION).exe" + mv .build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe $SetupPath + echo "##vso[task.setvariable variable=SYSTEM_SETUP_PATH]$SetupPath" + displayName: Build system setup - - powershell: .\build\azure-pipelines\win32\prepare-publish.ps1 - displayName: Publish + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $env:ESRPPKI = "$(ESRP-PKI)" + $env:ESRPAADUsername = "$(esrp-aad-username)" + $env:ESRPAADPassword = "$(esrp-aad-password)" + exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign } + $SetupPath = ".build\win32-$(VSCODE_ARCH)\user-setup\VSCodeUserSetup-$(VSCODE_ARCH)-$(VSCODE_VERSION).exe" + mv .build\win32-$(VSCODE_ARCH)\user-setup\VSCodeSetup.exe $SetupPath + echo "##vso[task.setvariable variable=USER_SETUP_PATH]$SetupPath" + displayName: Build user setup + + - powershell: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_" + condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')) + displayName: Generate artifact prefix - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: Generate SBOM (client) @@ -251,10 +315,6 @@ steps: BuildDropPath: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH) PackageName: Visual Studio Code - - publish: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/_manifest - displayName: Publish SBOM (client) - artifact: vscode_client_win32_$(VSCODE_ARCH)_sbom - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: Generate SBOM (server) inputs: @@ -262,29 +322,36 @@ steps: PackageName: Visual Studio Code Server condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) + - publish: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/_manifest + displayName: Publish SBOM (client) + artifact: $(ARTIFACT_PREFIX)sbom_client_win32_$(VSCODE_ARCH) + - publish: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)/_manifest displayName: Publish SBOM (server) - artifact: vscode_server_win32_$(VSCODE_ARCH)_sbom + artifact: $(ARTIFACT_PREFIX)sbom_server_win32_$(VSCODE_ARCH) condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) - - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\archive\$(ARCHIVE_NAME) - artifact: vscode_client_win32_$(VSCODE_ARCH)_archive + - publish: $(CLIENT_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_client_win32_$(VSCODE_ARCH)_archive + condition: and(succeededOrFailed(), ne(variables['CLIENT_PATH'], '')) displayName: Publish archive - - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\system-setup\$(SYSTEM_SETUP_NAME) - artifact: vscode_client_win32_$(VSCODE_ARCH)_setup + - publish: $(SERVER_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_server_win32_$(VSCODE_ARCH)_archive + condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64')) + displayName: Publish server archive + + - publish: $(WEB_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_web_win32_$(VSCODE_ARCH)_archive + condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64')) + displayName: Publish web server archive + + - publish: $(SYSTEM_SETUP_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_client_win32_$(VSCODE_ARCH)_setup + condition: and(succeededOrFailed(), ne(variables['SYSTEM_SETUP_PATH'], '')) displayName: Publish system setup - - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\user-setup\$(USER_SETUP_NAME) - artifact: vscode_client_win32_$(VSCODE_ARCH)_user-setup + - publish: $(USER_SETUP_PATH) + artifact: $(ARTIFACT_PREFIX)vscode_client_win32_$(VSCODE_ARCH)_user-setup + condition: and(succeededOrFailed(), ne(variables['USER_SETUP_PATH'], '')) displayName: Publish user setup - - - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH).zip - artifact: vscode_server_win32_$(VSCODE_ARCH)_archive - displayName: Publish server archive - condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) - - - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH)-web.zip - artifact: vscode_web_win32_$(VSCODE_ARCH)_archive - displayName: Publish web server archive - condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt new file mode 100644 index 00000000000..68c55c6a134 --- /dev/null +++ b/build/checksums/electron.txt @@ -0,0 +1,27 @@ +fe6d7067770403c61c413d3176e9ddc1ee28e0650597c469dd4c2965feafa7a0 *electron-v22.3.18-darwin-arm64-symbols.zip +a11c41f2b1e740e77fccc1e2e299e89f370cd8153420976c1b16628733969af4 *electron-v22.3.18-darwin-arm64.zip +a5329fde23814813aaed4283f1cb27db1e321fcecb34a15a716325194a9f2aae *electron-v22.3.18-darwin-x64-symbols.zip +d3ecd733a174b8fd16927285f9e9f3a5d401c29578619a6c12aec5c3845d0d51 *electron-v22.3.18-darwin-x64.zip +c1486b7536d5e4ad16caf37e1fe20ea3f445a09a44fd8c2ee3369b537527479f *electron-v22.3.18-linux-arm64-symbols.zip +4857d182cffb853b0c85c96e4e99d20316f95068398b7ac5424641e1f2263465 *electron-v22.3.18-linux-arm64.zip +edeb1d723594efdf392180e9720e804c9decd52bfa64a177bd5602c11de0c250 *electron-v22.3.18-linux-armv7l-symbols.zip +109cd957e64c728bd1b921385250d413c9546c7ba44d191a9e6a62ea39eb093b *electron-v22.3.18-linux-armv7l.zip +7587452b5390122d262e4fb26bb01e5583633d18a6b714149c13e53df90be9fd *electron-v22.3.18-linux-x64-symbols.zip +8b65f6c6b960dd6bc52acbb0fc54f232dfa8a9d6ed0e1504ee6baf346c90598b *electron-v22.3.18-linux-x64.zip +a97c04ee4d952fe21cd7141fd0baf36a8d16c5ffd165ecc70640d3d6817f7b69 *electron-v22.3.18-win32-arm64-pdb.zip +b849fe8ecab51e846c51b4059c467f8b4aeccf1451420494dfbc90f427a2fd64 *electron-v22.3.18-win32-arm64-symbols.zip +e67daaf16c3e03ce7f64feceadaa3909677e6385f79eb806aab726611e28060f *electron-v22.3.18-win32-arm64.zip +96bb514d47db2976572311296f361b5e3e4a2182d6cdcaa696432625d7a1b5a8 *electron-v22.3.18-win32-ia32-pdb.zip +a0dbcad02fd4304b3696080c77f8f6835b144dcb63db5275f33289d487356bb1 *electron-v22.3.18-win32-ia32-symbols.zip +b21f0e260f3251bf6f4ee41c81f882b3f609d067eca578e56e4c3a7a47360ef2 *electron-v22.3.18-win32-ia32.zip +abef6b14a6e613ed4087012ce197dff132bd30c5f29e394d4d30285f2d3dd481 *electron-v22.3.18-win32-x64-pdb.zip +60e4b6a17811c9afa5a499a9c7c651b55e4419320b4706479d62225dc5d67f5d *electron-v22.3.18-win32-x64-symbols.zip +f81cd80551268dfd915f17f0be8d23da168a7efc0c10ca004d2e4edd48a017ae *electron-v22.3.18-win32-x64.zip +953b3bcf735e3d9270b605e46af54352095304c4bc9ab8448d242a9e62242acc *ffmpeg-v22.3.18-darwin-arm64.zip +b81bc30765d0e3cbea5f813e4342c24d6984dc60b505e138a5e477c322d120be *ffmpeg-v22.3.18-darwin-x64.zip +59d2e2b2f2cc515a86a4e0cfd1116d10a8b25a8d58d45bb04de3512e156c944b *ffmpeg-v22.3.18-linux-arm64.zip +b9d3b227bee17666d395ee7882ef477a733c3eeef3f1d9f2e3616d2d02eb3376 *ffmpeg-v22.3.18-linux-armv7l.zip +fa07ef910b23a4ef4b6761bc16d20c0e70ff0259325c4d523129e2d9c5084174 *ffmpeg-v22.3.18-linux-x64.zip +2ee952c58f5b74dfbefa3390a91d2fca663b306bf7dc497fefe91663b9f5d0f3 *ffmpeg-v22.3.18-win32-arm64.zip +44c90b3c0655a3db3c6bde43eb8619c7ce45a93439ed729c373425467d00e346 *ffmpeg-v22.3.18-win32-ia32.zip +3b77a7f06274b91eff73f001063efe6c2298197728b2524e381be3050c123c46 *ffmpeg-v22.3.18-win32-x64.zip diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt new file mode 100644 index 00000000000..5229a5bc80a --- /dev/null +++ b/build/checksums/nodejs.txt @@ -0,0 +1,7 @@ +f9f02f7872e2e8ee54320fce13deb9d56904f32bb0615b6e21aa3371d8899150 node-v16.17.1-darwin-arm64.tar.gz +3db26761ad8493b894d42260d7e65094b7af9bc473588739e61bc1c32d6ff955 node-v16.17.1-darwin-x64.tar.gz +adc7032888d4e672a4aac886baede8c04fccdd1a2e7ab4bcf325e3f336f44a3d node-v16.17.1-linux-arm64.tar.gz +aeab05e35f1d2824ecfb88ca321f1408b44d292b2775f2890972c828e00216d0 node-v16.17.1-linux-armv7l.tar.gz +da5658693243b3ecf6a4cba6751a71df1eb9e9703ca93b42a9404aed85f58ad0 node-v16.17.1-linux-x64.tar.gz +f518a70dcab7c3fac5b2e1ef100b4f628edfb160f4fafa9a94ef222da8a6e9ab win-x64/node.exe +2393aff88be19dbe0205cbde4ff0c1d89911b15de5c99c80f6e5e29604eecd12 win-x86/node.exe diff --git a/build/filters.js b/build/filters.js index 095cf733f8c..5a8cf36ef84 100644 --- a/build/filters.js +++ b/build/filters.js @@ -32,6 +32,7 @@ module.exports.unicodeFilter = [ '**', '!**/ThirdPartyNotices.txt', + '!**/ThirdPartyNotices.cli.txt', '!**/LICENSE.{txt,rtf}', '!LICENSES.chromium.html', '!**/LICENSE', @@ -65,6 +66,7 @@ module.exports.indentationFilter = [ // except specific files '!**/ThirdPartyNotices.txt', + '!**/ThirdPartyNotices.cli.txt', '!**/LICENSE.{txt,rtf}', '!LICENSES.chromium.html', '!**/LICENSE', @@ -78,6 +80,7 @@ module.exports.indentationFilter = [ '!test/unit/assert.js', '!resources/linux/snap/electron-launch', '!build/ext.js', + '!build/npm/gyp/patches/gyp_spectre_mitigation_support.patch', // except specific folders '!test/automation/out/**', diff --git a/build/gulpfile.cli.js b/build/gulpfile.cli.js new file mode 100644 index 00000000000..2ed09314fc5 --- /dev/null +++ b/build/gulpfile.cli.js @@ -0,0 +1,189 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +//@ts-check + +const es = require('event-stream'); +const gulp = require('gulp'); +const path = require('path'); +const fancyLog = require('fancy-log'); +const ansiColors = require('ansi-colors'); +const cp = require('child_process'); +const { tmpdir } = require('os'); +const { promises: fs, existsSync, mkdirSync, rmSync } = require('fs'); + +const task = require('./lib/task'); +const watcher = require('./lib/watch'); +const { debounce } = require('./lib/util'); +const createReporter = require('./lib/reporter').createReporter; + +const root = 'cli'; +const rootAbs = path.resolve(__dirname, '..', root); +const src = `${root}/src`; +const targetCliPath = path.join(root, 'target', 'debug', process.platform === 'win32' ? 'code.exe' : 'code'); + +const platformOpensslDirName = + process.platform === 'win32' ? ( + process.arch === 'arm64' + ? 'arm64-windows-static-md' + : process.arch === 'ia32' + ? 'x86-windows-static-md' + : 'x64-windows-static-md') + : process.platform === 'darwin' ? ( + process.arch === 'arm64' + ? 'arm64-osx' + : 'x64-osx') + : (process.arch === 'arm64' + ? 'arm64-linux' + : process.arch === 'arm' + ? 'arm-linux' + : 'x64-linux'); +const platformOpensslDir = path.join(rootAbs, 'openssl', 'package', 'out', platformOpensslDirName); + +const hasLocalRust = (() => { + /** @type boolean | undefined */ + let result = undefined; + return () => { + if (result !== undefined) { + return result; + } + + try { + const r = cp.spawnSync('cargo', ['--version']); + result = r.status === 0; + } catch (e) { + result = false; + } + + return result; + }; +})(); + +const debounceEsStream = (fn, duration = 100) => { + let handle = undefined; + let pending = []; + const sendAll = (pending) => (event, ...args) => { + for (const stream of pending) { + pending.emit(event, ...args); + } + }; + + return es.map(function (_, callback) { + console.log('defer'); + if (handle !== undefined) { + clearTimeout(handle); + } + + handle = setTimeout(() => { + handle = undefined; + + const previous = pending; + pending = []; + fn() + .on('error', sendAll('error')) + .on('data', sendAll('data')) + .on('end', sendAll('end')); + }, duration); + + pending.push(this); + }); +}; + +const compileFromSources = (callback) => { + const proc = cp.spawn('cargo', ['--color', 'always', 'build'], { + cwd: root, + stdio: ['ignore', 'pipe', 'pipe'], + env: existsSync(platformOpensslDir) ? { OPENSSL_DIR: platformOpensslDir, ...process.env } : process.env + }); + + /** @type Buffer[] */ + const stdoutErr = []; + proc.stdout.on('data', d => stdoutErr.push(d)); + proc.stderr.on('data', d => stdoutErr.push(d)); + proc.on('error', callback); + proc.on('exit', code => { + if (code !== 0) { + callback(Buffer.concat(stdoutErr).toString()); + } else { + callback(); + } + }); +}; + +const acquireBuiltOpenSSL = (callback) => { + const untar = require('gulp-untar'); + const gunzip = require('gulp-gunzip'); + const dir = path.join(tmpdir(), 'vscode-openssl-download'); + mkdirSync(dir, { recursive: true }); + + cp.spawnSync( + process.platform === 'win32' ? 'npm.cmd' : 'npm', + ['pack', '@vscode/openssl-prebuilt'], + { stdio: ['ignore', 'ignore', 'inherit'], cwd: dir } + ); + + gulp.src('*.tgz', { cwd: dir }) + .pipe(gunzip()) + .pipe(untar()) + .pipe(gulp.dest(`${root}/openssl`)) + .on('error', callback) + .on('end', () => { + rmSync(dir, { recursive: true, force: true }); + callback(); + }); +}; + +const compileWithOpenSSLCheck = (/** @type import('./lib/reporter').IReporter */ reporter) => es.map((_, callback) => { + compileFromSources(err => { + if (!err) { + // no-op + } else if (err.toString().includes('Could not find directory of OpenSSL installation') && !existsSync(platformOpensslDir)) { + fancyLog(ansiColors.yellow(`[cli]`), 'OpenSSL libraries not found, acquiring prebuilt bits...'); + acquireBuiltOpenSSL(err => { + if (err) { + callback(err); + } else { + compileFromSources(err => { + if (err) { + reporter(err.toString()); + } + callback(null, ''); + }); + } + }); + } else { + reporter(err.toString()); + } + + callback(null, ''); + }); +}); + +const warnIfRustNotInstalled = () => { + if (!hasLocalRust()) { + fancyLog(ansiColors.yellow(`[cli]`), 'No local Rust install detected, compilation may fail.'); + fancyLog(ansiColors.yellow(`[cli]`), 'Get rust from: https://rustup.rs/'); + } +}; + +const compileCliTask = task.define('compile-cli', () => { + warnIfRustNotInstalled(); + const reporter = createReporter('cli'); + return gulp.src(`${root}/Cargo.toml`) + .pipe(compileWithOpenSSLCheck(reporter)) + .pipe(reporter.end(true)); +}); + + +const watchCliTask = task.define('watch-cli', () => { + warnIfRustNotInstalled(); + return watcher(`${src}/**`, { read: false }) + .pipe(debounce(compileCliTask)); +}); + +gulp.task(compileCliTask); +gulp.task(watchCliTask); diff --git a/build/gulpfile.compile.js b/build/gulpfile.compile.js index 1424c90e3d0..c4947e76cbf 100644 --- a/build/gulpfile.compile.js +++ b/build/gulpfile.compile.js @@ -11,15 +11,22 @@ const task = require('./lib/task'); const compilation = require('./lib/compilation'); const optimize = require('./lib/optimize'); -// Full compile, including nls and inline sources in sourcemaps, for build -const compileBuildTask = task.define('compile-build', - task.series( +function makeCompileBuildTask(disableMangle) { + return task.series( util.rimraf('out-build'), util.buildWebNodePaths('out-build'), compilation.compileApiProposalNamesTask, - compilation.compileTask('src', 'out-build', true), + compilation.compileTask('src', 'out-build', true, { disableMangle }), optimize.optimizeLoaderTask('out-build', 'out-build', true) - ) -); + ); +} + +// Full compile, including nls and inline sources in sourcemaps, mangling, minification, for build +const compileBuildTask = task.define('compile-build', makeCompileBuildTask(false)); gulp.task(compileBuildTask); exports.compileBuildTask = compileBuildTask; + +// Full compile for PR ci, e.g no mangling +const compileBuildTaskPullRequest = task.define('compile-build-pr', makeCompileBuildTask(true)); +gulp.task(compileBuildTaskPullRequest); +exports.compileBuildTaskPullRequest = compileBuildTaskPullRequest; diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js index 5fb1407be19..e2c9e3d9aba 100644 --- a/build/gulpfile.extensions.js +++ b/build/gulpfile.extensions.js @@ -238,12 +238,22 @@ const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimr const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series( cleanExtensionsBuildTask, task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))), - task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false).pipe(gulp.dest('.build'))), + task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false, false).pipe(gulp.dest('.build'))), )); gulp.task(compileExtensionsBuildTask); gulp.task(task.define('extensions-ci', task.series(compileExtensionsBuildTask, compileExtensionMediaBuildTask))); +const compileExtensionsBuildPullRequestTask = task.define('compile-extensions-build-pr', task.series( + cleanExtensionsBuildTask, + task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))), + task.define('bundle-extensions-build-pr', () => ext.packageLocalExtensionsStream(false, true).pipe(gulp.dest('.build'))), +)); + +gulp.task(compileExtensionsBuildPullRequestTask); +gulp.task(task.define('extensions-ci-pr', task.series(compileExtensionsBuildPullRequestTask, compileExtensionMediaBuildTask))); + + exports.compileExtensionsBuildTask = compileExtensionsBuildTask; //#endregion diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js index 4630eaad3cc..a235f55c79e 100644 --- a/build/gulpfile.reh.js +++ b/build/gulpfile.reh.js @@ -17,7 +17,6 @@ const rename = require('gulp-rename'); const replace = require('gulp-replace'); const filter = require('gulp-filter'); const { getProductionDependencies } = require('./lib/dependencies'); -const { assetFromGithub } = require('./lib/github'); const vfs = require('vinyl-fs'); const packageJson = require('../package.json'); const flatmap = require('gulp-flatmap'); @@ -29,6 +28,7 @@ const { compileBuildTask } = require('./gulpfile.compile'); const { compileExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions'); const { vscodeWebEntryPoints, vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require('./gulpfile.vscode.web'); const cp = require('child_process'); +const log = require('fancy-log'); const REPO_ROOT = path.dirname(__dirname); const commit = getVersion(REPO_ROOT); @@ -42,7 +42,6 @@ const BUILD_TARGETS = [ { platform: 'win32', arch: 'x64' }, { platform: 'darwin', arch: 'x64' }, { platform: 'darwin', arch: 'arm64' }, - { platform: 'linux', arch: 'ia32' }, { platform: 'linux', arch: 'x64' }, { platform: 'linux', arch: 'armhf' }, { platform: 'linux', arch: 'arm64' }, @@ -72,14 +71,13 @@ const serverResources = [ 'out-build/vs/base/node/ps.sh', // Terminal shell integration - 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration.fish', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-env.zsh', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-login.zsh', - 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration.fish', + 'out-build/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish', '!**/test/**' ]; @@ -127,11 +125,43 @@ const serverWithWebEntryPoints = [ function getNodeVersion() { const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8'); - const target = /^target "(.*)"$/m.exec(yarnrc)[1]; - return target; + const nodeVersion = /^target "(.*)"$/m.exec(yarnrc)[1]; + const internalNodeVersion = /^ms_build_id "(.*)"$/m.exec(yarnrc)[1]; + return { nodeVersion, internalNodeVersion }; } -const nodeVersion = getNodeVersion(); +function getNodeChecksum(nodeVersion, platform, arch) { + let expectedName; + switch (platform) { + case 'win32': + expectedName = `win-${arch}/node.exe`; + break; + + case 'darwin': + case 'alpine': + case 'linux': + expectedName = `node-v${nodeVersion}-${platform}-${arch}.tar.gz`; + break; + } + + const nodeJsChecksums = fs.readFileSync(path.join(REPO_ROOT, 'build', 'checksums', 'nodejs.txt'), 'utf8'); + for (const line of nodeJsChecksums.split('\n')) { + const [checksum, name] = line.split(/\s+/); + if (name === expectedName) { + return checksum; + } + } + return undefined; +} + +function extractAlpinefromDocker(nodeVersion, platform, arch) { + const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node'; + log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`); + const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' }); + return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]); +} + +const { nodeVersion, internalNodeVersion } = getNodeVersion(); BUILD_TARGETS.forEach(({ platform, arch }) => { gulp.task(task.define(`node-${platform}-${arch}`, () => { @@ -155,38 +185,53 @@ if (defaultNodeTask) { } function nodejs(platform, arch) { - const { remote } = require('./lib/gulpRemoteSource'); + const { fetchUrls, fetchGithub } = require('./lib/fetch'); const untar = require('gulp-untar'); + const crypto = require('crypto'); if (arch === 'ia32') { arch = 'x86'; - } - - if (platform === 'win32') { - if (product.nodejsRepository) { - return assetFromGithub(product.nodejsRepository, nodeVersion, name => name === `win-${arch}-node.exe`) - .pipe(rename('node.exe')); - } - - return remote(`/dist/v${nodeVersion}/win-${arch}/node.exe`, { base: 'https://nodejs.org' }) - .pipe(rename('node.exe')); - } - - if (arch === 'alpine' || platform === 'alpine') { - const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node'; - const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' }); - return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]); - } - - if (arch === 'armhf') { + } else if (arch === 'armhf') { arch = 'armv7l'; + } else if (arch === 'alpine') { + platform = 'alpine'; + arch = 'x64'; } - return remote(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org' }) - .pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar()))) - .pipe(filter('**/node')) - .pipe(util.setExecutableBit('**')) - .pipe(rename('node')); + log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejsRepository}...`); + + const checksumSha256 = getNodeChecksum(nodeVersion, platform, arch); + + if (checksumSha256) { + log(`Using SHA256 checksum for checking integrity: ${checksumSha256}`); + } else { + log.warn(`Unable to verify integrity of downloaded node.js binary because no SHA256 checksum was found!`); + } + + switch (platform) { + case 'win32': + return (product.nodejsRepository !== 'https://nodejs.org' ? + fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `win-${arch}-node.exe`, checksumSha256 }) : + fetchUrls(`/dist/v${nodeVersion}/win-${arch}/node.exe`, { base: 'https://nodejs.org', checksumSha256 })) + .pipe(rename('node.exe')); + case 'darwin': + case 'linux': + return (product.nodejsRepository !== 'https://nodejs.org' ? + fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `node-v${nodeVersion}-${platform}-${arch}.tar.gz`, checksumSha256 }) : + fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 }) + ).pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar()))) + .pipe(filter('**/node')) + .pipe(util.setExecutableBit('**')) + .pipe(rename('node')); + case 'alpine': + return product.nodejsRepository !== 'https://nodejs.org' ? + fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `node-v${nodeVersion}-${platform}-${arch}.tar.gz`, checksumSha256 }) + .pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar()))) + .pipe(filter('**/node')) + .pipe(util.setExecutableBit('**')) + .pipe(rename('node')) + : extractAlpinefromDocker(nodeVersion, platform, arch); + } } function packageTask(type, platform, arch, sourceFolderName, destinationFolderName) { @@ -267,6 +312,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa // filter out unnecessary files, no source maps in server build .pipe(filter(['**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map'])) .pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore'))) + .pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`))) .pipe(jsFilter) .pipe(util.stripSourceMappingURL()) .pipe(jsFilter.restore); @@ -310,8 +356,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa .pipe(replace('@@COMMIT@@', commit)) .pipe(replace('@@APPNAME@@', product.applicationName)) .pipe(rename(`bin/helpers/browser.cmd`)), - gulp.src('resources/server/bin/server-old.cmd', { base: '.' }) - .pipe(rename(`server.cmd`)), gulp.src('resources/server/bin/code-server.cmd', { base: '.' }) .pipe(rename(`bin/${product.serverApplicationName}.cmd`)), ); @@ -333,13 +377,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa .pipe(rename(`bin/${product.serverApplicationName}`)) .pipe(util.setExecutableBit()) ); - if (type !== 'reh-web') { - result = es.merge(result, - gulp.src('resources/server/bin/server-old.sh', { base: '.' }) - .pipe(rename(`server.sh`)) - .pipe(util.setExecutableBit()), - ); - } } return result.pipe(vfs.dest(destination)); diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index aa8de556bef..9505e8fe5ca 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -33,7 +33,6 @@ const createAsar = require('./lib/asar').createAsar; const minimist = require('minimist'); const { compileBuildTask } = require('./gulpfile.compile'); const { compileExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions'); -const { getSettingsSearchBuildId, shouldSetupSettingsSearch } = require('./azure-pipelines/upload-configuration'); const { promisify } = require('util'); const glob = promisify(require('glob')); const rcedit = promisify(require('rcedit')); @@ -68,7 +67,7 @@ const vscodeResources = [ 'out-build/vs/workbench/browser/media/*-theme.css', 'out-build/vs/workbench/contrib/debug/**/*.json', 'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt', - 'out-build/vs/workbench/contrib/terminal/browser/media/*.fish', + 'out-build/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/*.fish', 'out-build/vs/workbench/contrib/terminal/browser/media/*.ps1', 'out-build/vs/workbench/contrib/terminal/browser/media/*.sh', 'out-build/vs/workbench/contrib/terminal/browser/media/*.zsh', @@ -150,6 +149,16 @@ const core = task.define('core-ci', task.series( )); gulp.task(core); +const corePr = task.define('core-ci-pr', task.series( + gulp.task('compile-build-pr'), + task.parallel( + gulp.task('minify-vscode'), + gulp.task('minify-vscode-reh'), + gulp.task('minify-vscode-reh-web'), + ) +)); +gulp.task(corePr); + /** * Compute checksums for some files. * @@ -244,10 +253,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op const date = new Date().toISOString(); const productJsonUpdate = { commit, date, checksums, version }; - if (shouldSetupSettingsSearch()) { - productJsonUpdate.settingsSearchBuildId = getSettingsSearchBuildId(packageJson); - } - const productJsonStream = gulp.src(['product.json'], { base: '.' }) .pipe(json(productJsonUpdate)); @@ -266,6 +271,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op const deps = gulp.src(dependenciesSrc, { base: '.', dot: true }) .pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map'])) .pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore'))) + .pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`))) .pipe(jsFilter) .pipe(util.rewriteSourceMappingURL(sourceMappingURLBase)) .pipe(jsFilter.restore) diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js index 90f75ccfabd..0d7d3c5b7f8 100644 --- a/build/gulpfile.vscode.linux.js +++ b/build/gulpfile.vscode.linux.js @@ -297,12 +297,14 @@ const BUILD_TARGETS = [ BUILD_TARGETS.forEach(({ arch }) => { const debArch = getDebPackageArch(arch); const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch))); - const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch))); + gulp.task(prepareDebTask); + const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch)); gulp.task(buildDebTask); const rpmArch = getRpmPackageArch(arch); const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch))); - const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch))); + gulp.task(prepareRpmTask); + const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch)); gulp.task(buildRpmTask); const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(util.rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch))); diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js index 638691e42f3..85129a523da 100644 --- a/build/gulpfile.vscode.web.js +++ b/build/gulpfile.vscode.web.js @@ -233,7 +233,7 @@ function packageTask(sourceFolderName, destinationFolderName) { const compileWebExtensionsBuildTask = task.define('compile-web-extensions-build', task.series( task.define('clean-web-extensions-build', util.rimraf('.build/web/extensions')), - task.define('bundle-web-extensions-build', () => extensions.packageLocalExtensionsStream(true).pipe(gulp.dest('.build/web'))), + task.define('bundle-web-extensions-build', () => extensions.packageLocalExtensionsStream(true, false).pipe(gulp.dest('.build/web'))), task.define('bundle-marketplace-web-extensions-build', () => extensions.packageMarketplaceExtensionsStream(true).pipe(gulp.dest('.build/web'))), task.define('bundle-web-extension-media-build', () => extensions.buildExtensionMedia(false, '.build/web/extensions')), )); diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js index 0d3abdae01b..674eb41a503 100644 --- a/build/gulpfile.vscode.win32.js +++ b/build/gulpfile.vscode.win32.js @@ -10,7 +10,6 @@ const path = require('path'); const fs = require('fs'); const assert = require('assert'); const cp = require('child_process'); -const _7z = require('7zip')['7z']; const util = require('./lib/util'); const task = require('./lib/task'); const pkg = require('../package.json'); @@ -21,8 +20,6 @@ const mkdirp = require('mkdirp'); const repoPath = path.dirname(__dirname); const buildPath = (/** @type {string} */ arch) => path.join(path.dirname(repoPath), `VSCode-win32-${arch}`); -const zipDir = (/** @type {string} */ arch) => path.join(repoPath, '.build', `win32-${arch}`, 'archive'); -const zipPath = (/** @type {string} */ arch) => path.join(zipDir(arch), `VSCode-win32-${arch}.zip`); const setupDir = (/** @type {string} */ arch, /** @type {string} */ target) => path.join(repoPath, '.build', `win32-${arch}`, `${target}-setup`); const issPath = path.join(__dirname, 'win32', 'code.iss'); const innoSetupPath = path.join(path.dirname(path.dirname(require.resolve('innosetup'))), 'bin', 'ISCC.exe'); @@ -99,6 +96,10 @@ function buildWin32Setup(arch, target) { RegValueName: product.win32RegValueName, ShellNameShort: product.win32ShellNameShort, AppMutex: product.win32MutexName, + TunnelMutex: product.win32TunnelMutex, + TunnelServiceMutex: product.win32TunnelServiceMutex, + TunnelApplicationName: product.tunnelApplicationName, + ApplicationName: product.applicationName, Arch: arch, AppId: { 'ia32': ia32AppId, 'x64': x64AppId, 'arm64': arm64AppId }[arch], IncompatibleTargetAppId: { 'ia32': product.win32AppId, 'x64': product.win32x64AppId, 'arm64': product.win32arm64AppId }[arch], @@ -139,23 +140,6 @@ defineWin32SetupTasks('ia32', 'user'); defineWin32SetupTasks('x64', 'user'); defineWin32SetupTasks('arm64', 'user'); -/** - * @param {string} arch - */ -function archiveWin32Setup(arch) { - return cb => { - const args = ['a', '-tzip', zipPath(arch), '-x!CodeSignSummary*.md', '.', '-r']; - - cp.spawn(_7z, args, { stdio: 'inherit', cwd: buildPath(arch) }) - .on('error', cb) - .on('exit', () => cb(null)); - }; -} - -gulp.task(task.define('vscode-win32-ia32-archive', task.series(util.rimraf(zipDir('ia32')), archiveWin32Setup('ia32')))); -gulp.task(task.define('vscode-win32-x64-archive', task.series(util.rimraf(zipDir('x64')), archiveWin32Setup('x64')))); -gulp.task(task.define('vscode-win32-arm64-archive', task.series(util.rimraf(zipDir('arm64')), archiveWin32Setup('arm64')))); - /** * @param {string} arch */ diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js index 5f0e483ea08..222a3c014b2 100644 --- a/build/lib/builtInExtensions.js +++ b/build/lib/builtInExtensions.js @@ -134,4 +134,4 @@ if (require.main === module) { process.exit(1); }); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbHRJbkV4dGVuc2lvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJidWlsdEluRXh0ZW5zaW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyx5QkFBeUI7QUFDekIsNkJBQTZCO0FBQzdCLHlCQUF5QjtBQUN6QixpQ0FBaUM7QUFDakMsbUNBQW1DO0FBQ25DLHNDQUFzQztBQUN0QyxnQ0FBZ0M7QUFDaEMsb0NBQW9DO0FBQ3BDLHNDQUFzQztBQUN0QywwQ0FBMEM7QUFHMUMsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBbUJqQyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztBQUNuRCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsb0JBQW9CLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO0FBQ3BHLE1BQU0saUJBQWlCLEdBQTJCLFdBQVcsQ0FBQyxpQkFBaUIsSUFBSSxFQUFFLENBQUM7QUFDdEYsTUFBTSxvQkFBb0IsR0FBMkIsV0FBVyxDQUFDLG9CQUFvQixJQUFJLEVBQUUsQ0FBQztBQUM1RixNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxZQUFZLEVBQUUsY0FBYyxDQUFDLENBQUM7QUFDakcsTUFBTSxjQUFjLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGdEQUFnRCxDQUFDLENBQUM7QUFFdEYsU0FBUyxHQUFHLENBQUMsR0FBRyxRQUFrQjtJQUNqQyxJQUFJLGNBQWMsRUFBRTtRQUNuQixRQUFRLENBQUMsR0FBRyxRQUFRLENBQUMsQ0FBQztLQUN0QjtBQUNGLENBQUM7QUFFRCxTQUFTLGdCQUFnQixDQUFDLFNBQStCO0lBQ3hELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFLG1CQUFtQixFQUFFLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztBQUN2RSxDQUFDO0FBRUQsU0FBUyxVQUFVLENBQUMsU0FBK0I7SUFDbEQsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsRUFBRSxjQUFjLENBQUMsQ0FBQztJQUUzRSxJQUFJLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsRUFBRTtRQUNoQyxPQUFPLEtBQUssQ0FBQztLQUNiO0lBRUQsTUFBTSxlQUFlLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUUzRSxJQUFJO1FBQ0gsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQyxPQUFPLENBQUM7UUFDeEQsT0FBTyxDQUFDLFdBQVcsS0FBSyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUM7S0FDM0M7SUFBQyxPQUFPLEdBQUcsRUFBRTtRQUNiLE9BQU8sS0FBSyxDQUFDO0tBQ2I7QUFDRixDQUFDO0FBRUQsU0FBUywwQkFBMEIsQ0FBQyxTQUErQjtJQUNsRSxNQUFNLGlCQUFpQixHQUFHLFdBQVcsQ0FBQyxpQkFBaUIsRUFBRSxVQUFVLENBQUM7SUFDcEUsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLGlCQUFpQixFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1NBQ3hHLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxHQUFHLEdBQUcsU0FBUyxDQUFDLElBQUksSUFBSSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQ25FLENBQUM7QUFFRCxTQUFnQixrQkFBa0IsQ0FBQyxTQUErQjtJQUNqRSwrRUFBK0U7SUFDL0UsSUFBSSxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUU7UUFDMUIsR0FBRyxDQUFDLGNBQWMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLElBQUksU0FBUyxDQUFDLE9BQU8sYUFBYSxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNqRyxPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFLEdBQUcsRUFBRSxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLENBQUM7YUFDckUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLEdBQUcsR0FBRyxTQUFTLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUM7S0FDbEU7SUFFRCxPQUFPLDBCQUEwQixDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzlDLENBQUM7QUFURCxnREFTQztBQUVELFNBQVMsd0JBQXdCLENBQUMsU0FBK0I7SUFDaEUsTUFBTSxpQkFBaUIsR0FBRyxXQUFXLENBQUMsaUJBQWlCLEVBQUUsVUFBVSxDQUFDO0lBQ3BFLE1BQU0sTUFBTSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDakYsSUFBSSxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUU7UUFDMUIsR0FBRyxDQUFDLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLElBQUksU0FBUyxDQUFDLE9BQU8sRUFBRSxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUM5RSxPQUFPLEVBQUUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUM7S0FDeEI7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFFekMsT0FBTywwQkFBMEIsQ0FBQyxTQUFTLENBQUM7U0FDMUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsMEJBQTBCLENBQUMsQ0FBQztTQUMxQyxFQUFFLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUN4RSxDQUFDO0FBRUQsU0FBUyxhQUFhLENBQUMsU0FBK0IsRUFBRSxZQUF3QztJQUMvRixJQUFJLFNBQVMsQ0FBQyxTQUFTLEVBQUU7UUFDeEIsTUFBTSxTQUFTLEdBQUcsSUFBSSxHQUFHLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRS9DLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRTtZQUNyQyxHQUFHLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLElBQUksU0FBUyxDQUFDLE9BQU8sZUFBZSxPQUFPLENBQUMsUUFBUSxxQkFBcUIsU0FBUyxDQUFDLFNBQVMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUN6SyxPQUFPLEVBQUUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUM7U0FDeEI7S0FDRDtJQUVELFFBQVEsWUFBWSxFQUFFO1FBQ3JCLEtBQUssVUFBVTtZQUNkLEdBQUcsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7WUFDcEUsT0FBTyxFQUFFLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRXpCLEtBQUssYUFBYTtZQUNqQixPQUFPLHdCQUF3QixDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRTVDO1lBQ0MsSUFBSSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsWUFBWSxDQUFDLEVBQUU7Z0JBQ2pDLEdBQUcsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLDhCQUE4QixTQUFTLENBQUMsSUFBSSxnQ0FBZ0MsWUFBWSxpQ0FBaUMsQ0FBQyxDQUFDLENBQUM7Z0JBQy9JLE9BQU8sRUFBRSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQzthQUV4QjtpQkFBTSxJQUFJLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxjQUFjLENBQUMsQ0FBQyxFQUFFO2dCQUNuRSxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyw4QkFBOEIsU0FBUyxDQUFDLElBQUksZ0NBQWdDLFlBQVksMERBQTBELENBQUMsQ0FBQyxDQUFDO2dCQUN4SyxPQUFPLEVBQUUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUM7YUFDeEI7WUFFRCxHQUFHLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLEtBQUssVUFBVSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsRUFBRSxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUMvRyxPQUFPLEVBQUUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUM7S0FDekI7QUFDRixDQUFDO0FBTUQsU0FBUyxlQUFlO0lBQ3ZCLElBQUk7UUFDSCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxlQUFlLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztLQUM1RDtJQUFDLE9BQU8sR0FBRyxFQUFFO1FBQ2IsT0FBTyxFQUFFLENBQUM7S0FDVjtBQUNGLENBQUM7QUFFRCxTQUFTLGdCQUFnQixDQUFDLE9BQXFCO0lBQzlDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO0lBQzNDLEVBQUUsQ0FBQyxhQUFhLENBQUMsZUFBZSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3JFLENBQUM7QUFFRCxTQUFnQixvQkFBb0I7SUFDbkMsR0FBRyxDQUFDLHNDQUFzQyxDQUFDLENBQUM7SUFDNUMsR0FBRyxDQUFDLCtDQUErQyxVQUFVLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUV4RixNQUFNLE9BQU8sR0FBRyxlQUFlLEVBQUUsQ0FBQztJQUNsQyxNQUFNLE9BQU8sR0FBYSxFQUFFLENBQUM7SUFFN0IsS0FBSyxNQUFNLFNBQVMsSUFBSSxDQUFDLEdBQUcsaUJBQWlCLEVBQUUsR0FBRyxvQkFBb0IsQ0FBQyxFQUFFO1FBQ3hFLE1BQU0sWUFBWSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksYUFBYSxDQUFDO1FBQzlELE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEdBQUcsWUFBWSxDQUFDO1FBRXZDLE9BQU8sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLFNBQVMsRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDO0tBQ3JEO0lBRUQsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFMUIsT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUN0QyxFQUFFLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQzthQUNmLEVBQUUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDO2FBQ25CLEVBQUUsQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDdEIsQ0FBQyxDQUFDLENBQUM7QUFDSixDQUFDO0FBckJELG9EQXFCQztBQUVELElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxNQUFNLEVBQUU7SUFDNUIsb0JBQW9CLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUM5RCxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ25CLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakIsQ0FBQyxDQUFDLENBQUM7Q0FDSCJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbHRJbkV4dGVuc2lvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJidWlsdEluRXh0ZW5zaW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyx5QkFBeUI7QUFDekIsNkJBQTZCO0FBQzdCLHlCQUF5QjtBQUN6QixpQ0FBaUM7QUFDakMsbUNBQW1DO0FBQ25DLHNDQUFzQztBQUN0QyxnQ0FBZ0M7QUFDaEMsb0NBQW9DO0FBQ3BDLHNDQUFzQztBQUN0QywwQ0FBMEM7QUFHMUMsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBb0JqQyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztBQUNuRCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsb0JBQW9CLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO0FBQ3BHLE1BQU0saUJBQWlCLEdBQTJCLFdBQVcsQ0FBQyxpQkFBaUIsSUFBSSxFQUFFLENBQUM7QUFDdEYsTUFBTSxvQkFBb0IsR0FBMkIsV0FBVyxDQUFDLG9CQUFvQixJQUFJLEVBQUUsQ0FBQztBQUM1RixNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxZQUFZLEVBQUUsY0FBYyxDQUFDLENBQUM7QUFDakcsTUFBTSxjQUFjLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGdEQUFnRCxDQUFDLENBQUM7QUFFdEYsU0FBUyxHQUFHLENBQUMsR0FBRyxRQUFrQjtJQUNqQyxJQUFJLGNBQWMsRUFBRTtRQUNuQixRQUFRLENBQUMsR0FBRyxRQUFRLENBQUMsQ0FBQztLQUN0QjtBQUNGLENBQUM7QUFFRCxTQUFTLGdCQUFnQixDQUFDLFNBQStCO0lBQ3hELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFLG1CQUFtQixFQUFFLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztBQUN2RSxDQUFDO0FBRUQsU0FBUyxVQUFVLENBQUMsU0FBK0I7SUFDbEQsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsRUFBRSxjQUFjLENBQUMsQ0FBQztJQUUzRSxJQUFJLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsRUFBRTtRQUNoQyxPQUFPLEtBQUssQ0FBQztLQUNiO0lBRUQsTUFBTSxlQUFlLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUUzRSxJQUFJO1FBQ0gsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQyxPQUFPLENBQUM7UUFDeEQsT0FBTyxDQUFDLFdBQVcsS0FBSyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUM7S0FDM0M7SUFBQyxPQUFPLEdBQUcsRUFBRTtRQUNiLE9BQU8sS0FBSyxDQUFDO0tBQ2I7QUFDRixDQUFDO0FBRUQsU0FBUywwQkFBMEIsQ0FBQyxTQUErQjtJQUNsRSxNQUFNLGlCQUFpQixHQUFHLFdBQVcsQ0FBQyxpQkFBaUIsRUFBRSxVQUFVLENBQUM7SUFDcEUsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLGlCQUFpQixFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1NBQ3hHLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxHQUFHLEdBQUcsU0FBUyxDQUFDLElBQUksSUFBSSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQ25FLENBQUM7QUFFRCxTQUFnQixrQkFBa0IsQ0FBQyxTQUErQjtJQUNqRSwrRUFBK0U7SUFDL0UsSUFBSSxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUU7UUFDMUIsR0FBRyxDQUFDLGNBQWMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLElBQUksU0FBUyxDQUFDLE9BQU8sYUFBYSxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNqRyxPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFLEdBQUcsRUFBRSxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLENBQUM7YUFDckUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLEdBQUcsR0FBRyxTQUFTLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUM7S0FDbEU7SUFFRCxPQUFPLDBCQUEwQixDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzlDLENBQUM7QUFURCxnREFTQztBQUVELFNBQVMsd0JBQXdCLENBQUMsU0FBK0I7SUFDaEUsTUFBTSxpQkFBaUIsR0FBRyxXQUFXLENBQUMsaUJBQWlCLEVBQUUsVUFBVSxDQUFDO0lBQ3BFLE1BQU0sTUFBTSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDakYsSUFBSSxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUU7UUFDMUIsR0FBRyxDQUFDLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLElBQUksU0FBUyxDQUFDLE9BQU8sRUFBRSxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUM5RSxPQUFPLEVBQUUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUM7S0FDeEI7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFFekMsT0FBTywwQkFBMEIsQ0FBQyxTQUFTLENBQUM7U0FDMUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsMEJBQTBCLENBQUMsQ0FBQztTQUMxQyxFQUFFLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUN4RSxDQUFDO0FBRUQsU0FBUyxhQUFhLENBQUMsU0FBK0IsRUFBRSxZQUF3QztJQUMvRixJQUFJLFNBQVMsQ0FBQyxTQUFTLEVBQUU7UUFDeEIsTUFBTSxTQUFTLEdBQUcsSUFBSSxHQUFHLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRS9DLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRTtZQUNyQyxHQUFHLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLElBQUksU0FBUyxDQUFDLE9BQU8sZUFBZSxPQUFPLENBQUMsUUFBUSxxQkFBcUIsU0FBUyxDQUFDLFNBQVMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUN6SyxPQUFPLEVBQUUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUM7U0FDeEI7S0FDRDtJQUVELFFBQVEsWUFBWSxFQUFFO1FBQ3JCLEtBQUssVUFBVTtZQUNkLEdBQUcsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7WUFDcEUsT0FBTyxFQUFFLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRXpCLEtBQUssYUFBYTtZQUNqQixPQUFPLHdCQUF3QixDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRTVDO1lBQ0MsSUFBSSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsWUFBWSxDQUFDLEVBQUU7Z0JBQ2pDLEdBQUcsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLDhCQUE4QixTQUFTLENBQUMsSUFBSSxnQ0FBZ0MsWUFBWSxpQ0FBaUMsQ0FBQyxDQUFDLENBQUM7Z0JBQy9JLE9BQU8sRUFBRSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQzthQUV4QjtpQkFBTSxJQUFJLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxjQUFjLENBQUMsQ0FBQyxFQUFFO2dCQUNuRSxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyw4QkFBOEIsU0FBUyxDQUFDLElBQUksZ0NBQWdDLFlBQVksMERBQTBELENBQUMsQ0FBQyxDQUFDO2dCQUN4SyxPQUFPLEVBQUUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUM7YUFDeEI7WUFFRCxHQUFHLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLEtBQUssVUFBVSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsRUFBRSxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUMvRyxPQUFPLEVBQUUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUM7S0FDekI7QUFDRixDQUFDO0FBTUQsU0FBUyxlQUFlO0lBQ3ZCLElBQUk7UUFDSCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxlQUFlLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztLQUM1RDtJQUFDLE9BQU8sR0FBRyxFQUFFO1FBQ2IsT0FBTyxFQUFFLENBQUM7S0FDVjtBQUNGLENBQUM7QUFFRCxTQUFTLGdCQUFnQixDQUFDLE9BQXFCO0lBQzlDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO0lBQzNDLEVBQUUsQ0FBQyxhQUFhLENBQUMsZUFBZSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3JFLENBQUM7QUFFRCxTQUFnQixvQkFBb0I7SUFDbkMsR0FBRyxDQUFDLHNDQUFzQyxDQUFDLENBQUM7SUFDNUMsR0FBRyxDQUFDLCtDQUErQyxVQUFVLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUV4RixNQUFNLE9BQU8sR0FBRyxlQUFlLEVBQUUsQ0FBQztJQUNsQyxNQUFNLE9BQU8sR0FBYSxFQUFFLENBQUM7SUFFN0IsS0FBSyxNQUFNLFNBQVMsSUFBSSxDQUFDLEdBQUcsaUJBQWlCLEVBQUUsR0FBRyxvQkFBb0IsQ0FBQyxFQUFFO1FBQ3hFLE1BQU0sWUFBWSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksYUFBYSxDQUFDO1FBQzlELE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEdBQUcsWUFBWSxDQUFDO1FBRXZDLE9BQU8sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLFNBQVMsRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDO0tBQ3JEO0lBRUQsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFMUIsT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUN0QyxFQUFFLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQzthQUNmLEVBQUUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDO2FBQ25CLEVBQUUsQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDdEIsQ0FBQyxDQUFDLENBQUM7QUFDSixDQUFDO0FBckJELG9EQXFCQztBQUVELElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxNQUFNLEVBQUU7SUFDNUIsb0JBQW9CLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUM5RCxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ25CLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakIsQ0FBQyxDQUFDLENBQUM7Q0FDSCJ9 \ No newline at end of file diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts index 912e05653ac..fefed436bb9 100644 --- a/build/lib/builtInExtensions.ts +++ b/build/lib/builtInExtensions.ts @@ -20,6 +20,7 @@ const mkdirp = require('mkdirp'); export interface IExtensionDefinition { name: string; version: string; + sha256: string; repo: string; platforms?: string[]; metadata: { diff --git a/build/lib/compilation.js b/build/lib/compilation.js index 63ddeb2eabd..2270e054ba5 100644 --- a/build/lib/compilation.js +++ b/build/lib/compilation.js @@ -19,7 +19,7 @@ const os = require("os"); const ts = require("typescript"); const File = require("vinyl"); const task = require("./task"); -const mangleTypeScript_1 = require("./mangleTypeScript"); +const index_1 = require("./mangle/index"); const watch = require('./watch'); // --- gulp-tsb: compile and transpile -------------------------------- const reporter = (0, reporter_1.createReporter)(); @@ -105,20 +105,20 @@ function compileTask(src, out, build, options = {}) { // mangle: TypeScript to TypeScript let mangleStream = es.through(); if (build && !options.disableMangle) { - let ts2tsMangler = new mangleTypeScript_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data)); + let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true }); const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState'])); - mangleStream = es.through(function write(data) { + mangleStream = es.through(async function write(data) { const tsNormalPath = ts.normalizePath(data.path); - const newContents = newContentsByFileName.get(tsNormalPath); + const newContents = (await newContentsByFileName).get(tsNormalPath); if (newContents !== undefined) { data.contents = Buffer.from(newContents.out); data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap); } this.push(data); - }, function end() { - this.push(null); + }, async function end() { // free resources - newContentsByFileName.clear(); + (await newContentsByFileName).clear(); + this.push(null); ts2tsMangler = undefined; }); } @@ -281,4 +281,4 @@ exports.watchApiProposalNamesTask = task.define('watch-api-proposal-names', () = .pipe(util.debounce(task)) .pipe(gulp.dest('src')); }); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"compilation.js","sourceRoot":"","sources":["compilation.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,mCAAmC;AACnC,yBAAyB;AACzB,6BAA6B;AAC7B,6BAA6B;AAC7B,0CAA0C;AAC1C,6BAA6B;AAC7B,yCAA4C;AAC5C,+BAA+B;AAC/B,sCAAsC;AACtC,0CAA0C;AAC1C,yBAAyB;AACzB,iCAAkC;AAClC,8BAA8B;AAC9B,+BAA+B;AAC/B,yDAA6C;AAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAGjC,uEAAuE;AAEvE,MAAM,QAAQ,GAAG,IAAA,yBAAc,GAAE,CAAC;AAElC,SAAS,4BAA4B,CAAC,GAAW;IAChD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC;IACrD,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC;IACxB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IACzB,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,EAAE,sCAAsC;QAC/E,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;KAC1B;IACD,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;IAC1B,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;IAC1B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,KAAc,EAAE,SAAkB,EAAE,aAAyC;IAChH,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAA2B,CAAC;IACvD,MAAM,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAqC,CAAC;IAGlF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;IACzE,MAAM,eAAe,GAAG,EAAE,GAAG,4BAA4B,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;IAChG,IAAI,CAAC,KAAK,EAAE;QACX,eAAe,CAAC,eAAe,GAAG,IAAI,CAAC;KACvC;IAED,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,eAAe,EAAE;QAC5D,OAAO,EAAE,KAAK;QACd,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;QACrC,gBAAgB,EAAE,OAAO,aAAa,KAAK,SAAS,IAAI,aAAa,CAAC,GAAG;KACzE,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAEzB,SAAS,QAAQ,CAAC,KAA+B;QAChD,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAA8B,CAAC;QAE7D,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9D,MAAM,UAAU,GAAG,CAAC,CAAO,EAAE,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxE,MAAM,WAAW,GAAG,CAAC,CAAO,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACxF,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEhF,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,KAAK;aAClB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,yEAAyE;aAC3G,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,WAAW,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;aACpE,IAAI,CAAC,QAAQ,CAAC;aACd,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;aAC3B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aACxB,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;aAChC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;aAClC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE;YACpD,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE,CAAC,CAAC,KAAK;YACvB,UAAU,EAAE,eAAe,CAAC,UAAU;SACtC,CAAC,CAAC,CAAC;aACH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;aACtB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAElC,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,QAAQ,CAAC,YAAY,GAAG,GAAG,EAAE;QAC5B,OAAO,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,CAAC,CAAC;IACF,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,SAAgB,aAAa,CAAC,GAAW,EAAE,GAAW,EAAE,GAAY;IAEnE,OAAO;QAEN,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;QAE1D,OAAO,OAAO;aACZ,IAAI,CAAC,SAAS,EAAE,CAAC;aACjB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AAXD,sCAWC;AAED,SAAgB,WAAW,CAAC,GAAW,EAAE,GAAW,EAAE,KAAc,EAAE,UAAuC,EAAE;IAE9G,OAAO;QAEN,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,UAAa,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;SACnD;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,GAAG,KAAK,KAAK,EAAE;YAClB,SAAS,CAAC,OAAO,EAAE,CAAC;SACpB;QAED,mCAAmC;QACnC,IAAI,YAAY,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAChC,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;YACpC,IAAI,YAAY,GAAG,IAAI,0BAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YAClH,MAAM,qBAAqB,GAAG,YAAY,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAC1F,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,KAAK,CAAC,IAAyC;gBAEjF,MAAM,YAAY,GAAmB,EAAG,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClE,MAAM,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC5D,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC9B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;oBAC7C,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;iBAC5E;gBACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC,EAAE,SAAS,GAAG;gBACd,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChB,iBAAiB;gBACjB,qBAAqB,CAAC,KAAK,EAAE,CAAC;gBACxB,YAAa,GAAG,SAAS,CAAC;YACjC,CAAC,CAAC,CAAC;SACH;QAED,OAAO,OAAO;aACZ,IAAI,CAAC,YAAY,CAAC;aAClB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aACtB,IAAI,CAAC,OAAO,EAAE,CAAC;aACf,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AA3CD,kCA2CC;AAED,SAAgB,SAAS,CAAC,GAAW,EAAE,KAAc;IAEpD,OAAO;QACN,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAE1D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;QAElE,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,SAAS,CAAC,OAAO,EAAE,CAAC;QAEpB,OAAO,QAAQ;aACb,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aACtB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AAhBD,8BAgBC;AAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAE1D,MAAM,eAAe;IACH,QAAQ,CAAU;IACnB,MAAM,CAAyB;IAE9B,aAAa,CAAkC;IAC/C,WAAW,CAAuB;IAClC,oBAAoB,CAAgC;IAErE,YAAY,OAAgB;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAE,EAAE;YAC7D,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACnB,OAAO;aACP;YACD,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;gBACjC,OAAO;aACP;YACD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;YAEpC,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,EAAE;gBAC3B,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACpD,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,KAAM,SAAQ,SAAS,CAAC,UAAU;YACjD,YAAY,CAAC,QAAgB,EAAE,QAAgB;gBACrD,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBACnC,OAAO,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;SACD,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,IAAI,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEhF,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE;gBACxC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC,CAAC,CAAC;SACH;IACF,CAAC;IAEO,iBAAiB,GAAwB,IAAI,CAAC;IAC9C,YAAY;QACnB,IAAI,IAAI,CAAC,iBAAiB,KAAK,IAAI,EAAE;YACpC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACrC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;SAC9B;QACD,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,EAAE,EAAE,CAAC,CAAC;IACR,CAAC;IAEO,IAAI;QACX,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACpD,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACzB,4DAA4D;YAC5D,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SAClE;QACD,OAAO,CAAC,CAAC;IACV,CAAC;IAEO,IAAI,CAAC,OAAY,EAAE,GAAG,IAAW;QACxC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9D,CAAC;IAEM,OAAO;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE;YACZ,yBAAyB;YACzB,OAAO;SACP;QACD,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,OAAO;SACP;QAED,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAClD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,gDAAgD,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7G,IAAI,CAAC,IAAI,CAAC,4CAA4C,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,KAAK,CAAC,CAAC;QACnF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,qFAAqF,CAAC,CAAC;SACjH;IACF,CAAC;CACD;AAED,SAAS,wBAAwB;IAChC,IAAI,GAAW,CAAC;IAEhB,IAAI;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,uEAAuE,EAAE,OAAO,CAAC,CAAC;QAC9G,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC;KAChC;IAAC,MAAM;QACP,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC;KACb;IAED,MAAM,OAAO,GAAG,uCAAuC,CAAC;IACxD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAExC,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;SACpD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,KAAK,EAAE;YACV,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5B;IACF,CAAC,EAAE;QACF,MAAM,KAAK,GAAG,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG;YAChB,iGAAiG;YACjG,+DAA+D;YAC/D,kGAAkG;YAClG,kGAAkG;YAClG,EAAE;YACF,oDAAoD;YACpD,EAAE;YACF,gDAAgD;YAChD,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,6FAA6F,IAAI,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE;YAC1J,KAAK;YACL,6DAA6D;YAC7D,EAAE;SACF,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC;YAC1B,IAAI,EAAE,mEAAmE;YACzE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC/B,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,wBAAwB,GAAG,IAAA,yBAAc,EAAC,oBAAoB,CAAC,CAAC;AAEzD,QAAA,2BAA2B,GAAG,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACzF,OAAO,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;SAClC,IAAI,CAAC,wBAAwB,EAAE,CAAC;SAChC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACrF,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;SAC9C,IAAI,CAAC,wBAAwB,EAAE,CAAC;SAChC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3C,OAAO,KAAK,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;SACnD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1B,CAAC,CAAC,CAAC"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"compilation.js","sourceRoot":"","sources":["compilation.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,mCAAmC;AACnC,yBAAyB;AACzB,6BAA6B;AAC7B,6BAA6B;AAC7B,0CAA0C;AAC1C,6BAA6B;AAC7B,yCAA4C;AAC5C,+BAA+B;AAC/B,sCAAsC;AACtC,0CAA0C;AAC1C,yBAAyB;AACzB,iCAAkC;AAClC,8BAA8B;AAC9B,+BAA+B;AAC/B,0CAAyC;AAEzC,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAGjC,uEAAuE;AAEvE,MAAM,QAAQ,GAAG,IAAA,yBAAc,GAAE,CAAC;AAElC,SAAS,4BAA4B,CAAC,GAAW;IAChD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC;IACrD,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC;IACxB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IACzB,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,EAAE,sCAAsC;QAC/E,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;KAC1B;IACD,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;IAC1B,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;IAC1B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,KAAc,EAAE,SAAkB,EAAE,aAAyC;IAChH,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAA2B,CAAC;IACvD,MAAM,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAqC,CAAC;IAGlF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;IACzE,MAAM,eAAe,GAAG,EAAE,GAAG,4BAA4B,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;IAChG,IAAI,CAAC,KAAK,EAAE;QACX,eAAe,CAAC,eAAe,GAAG,IAAI,CAAC;KACvC;IAED,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,eAAe,EAAE;QAC5D,OAAO,EAAE,KAAK;QACd,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;QACrC,gBAAgB,EAAE,OAAO,aAAa,KAAK,SAAS,IAAI,aAAa,CAAC,GAAG;KACzE,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAEzB,SAAS,QAAQ,CAAC,KAA+B;QAChD,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAA8B,CAAC;QAE7D,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9D,MAAM,UAAU,GAAG,CAAC,CAAO,EAAE,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxE,MAAM,WAAW,GAAG,CAAC,CAAO,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACxF,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEhF,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,KAAK;aAClB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,yEAAyE;aAC3G,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,WAAW,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;aACpE,IAAI,CAAC,QAAQ,CAAC;aACd,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;aAC3B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aACxB,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;aAChC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;aAClC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE;YACpD,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE,CAAC,CAAC,KAAK;YACvB,UAAU,EAAE,eAAe,CAAC,UAAU;SACtC,CAAC,CAAC,CAAC;aACH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;aACtB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAElC,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,QAAQ,CAAC,YAAY,GAAG,GAAG,EAAE;QAC5B,OAAO,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,CAAC,CAAC;IACF,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,SAAgB,aAAa,CAAC,GAAW,EAAE,GAAW,EAAE,GAAY;IAEnE,OAAO;QAEN,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;QAE1D,OAAO,OAAO;aACZ,IAAI,CAAC,SAAS,EAAE,CAAC;aACjB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AAXD,sCAWC;AAED,SAAgB,WAAW,CAAC,GAAW,EAAE,GAAW,EAAE,KAAc,EAAE,UAAuC,EAAE;IAE9G,OAAO;QAEN,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,UAAa,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;SACnD;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,GAAG,KAAK,KAAK,EAAE;YAClB,SAAS,CAAC,OAAO,EAAE,CAAC;SACpB;QAED,mCAAmC;QACnC,IAAI,YAAY,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAChC,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;YACpC,IAAI,YAAY,GAAG,IAAI,eAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;YACtK,MAAM,qBAAqB,GAAG,YAAY,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAC1F,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,UAAU,KAAK,CAAC,IAAyC;gBAEvF,MAAM,YAAY,GAAmB,EAAG,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClE,MAAM,WAAW,GAAG,CAAC,MAAM,qBAAqB,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBACpE,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC9B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;oBAC7C,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;iBAC5E;gBACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC,EAAE,KAAK,UAAU,GAAG;gBACpB,iBAAiB;gBACjB,CAAC,MAAM,qBAAqB,CAAC,CAAC,KAAK,EAAE,CAAC;gBAEtC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACV,YAAa,GAAG,SAAS,CAAC;YACjC,CAAC,CAAC,CAAC;SACH;QAED,OAAO,OAAO;aACZ,IAAI,CAAC,YAAY,CAAC;aAClB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aACtB,IAAI,CAAC,OAAO,EAAE,CAAC;aACf,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AA5CD,kCA4CC;AAED,SAAgB,SAAS,CAAC,GAAW,EAAE,KAAc;IAEpD,OAAO;QACN,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAE1D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;QAElE,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAC5C,SAAS,CAAC,OAAO,EAAE,CAAC;QAEpB,OAAO,QAAQ;aACb,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aACtB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;AACH,CAAC;AAhBD,8BAgBC;AAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAE1D,MAAM,eAAe;IACH,QAAQ,CAAU;IACnB,MAAM,CAAyB;IAE9B,aAAa,CAAkC;IAC/C,WAAW,CAAuB;IAClC,oBAAoB,CAAgC;IAErE,YAAY,OAAgB;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAE,EAAE;YAC7D,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACnB,OAAO;aACP;YACD,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;gBACjC,OAAO;aACP;YACD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;YAEpC,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,EAAE;gBAC3B,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACpD,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,KAAM,SAAQ,SAAS,CAAC,UAAU;YACjD,YAAY,CAAC,QAAgB,EAAE,QAAgB;gBACrD,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBACnC,OAAO,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;SACD,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,IAAI,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEhF,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE;gBACxC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC,CAAC,CAAC;SACH;IACF,CAAC;IAEO,iBAAiB,GAAwB,IAAI,CAAC;IAC9C,YAAY;QACnB,IAAI,IAAI,CAAC,iBAAiB,KAAK,IAAI,EAAE;YACpC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACrC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;SAC9B;QACD,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,EAAE,EAAE,CAAC,CAAC;IACR,CAAC;IAEO,IAAI;QACX,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACpD,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACzB,4DAA4D;YAC5D,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SAClE;QACD,OAAO,CAAC,CAAC;IACV,CAAC;IAEO,IAAI,CAAC,OAAY,EAAE,GAAG,IAAW;QACxC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9D,CAAC;IAEM,OAAO;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE;YACZ,yBAAyB;YACzB,OAAO;SACP;QACD,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,OAAO;SACP;QAED,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAClD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,gDAAgD,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7G,IAAI,CAAC,IAAI,CAAC,4CAA4C,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,KAAK,CAAC,CAAC;QACnF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,qFAAqF,CAAC,CAAC;SACjH;IACF,CAAC;CACD;AAED,SAAS,wBAAwB;IAChC,IAAI,GAAW,CAAC;IAEhB,IAAI;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,uEAAuE,EAAE,OAAO,CAAC,CAAC;QAC9G,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC;KAChC;IAAC,MAAM;QACP,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC;KACb;IAED,MAAM,OAAO,GAAG,uCAAuC,CAAC;IACxD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAExC,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;SACpD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,KAAK,EAAE;YACV,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5B;IACF,CAAC,EAAE;QACF,MAAM,KAAK,GAAG,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG;YAChB,iGAAiG;YACjG,+DAA+D;YAC/D,kGAAkG;YAClG,kGAAkG;YAClG,EAAE;YACF,oDAAoD;YACpD,EAAE;YACF,gDAAgD;YAChD,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,6FAA6F,IAAI,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE;YAC1J,KAAK;YACL,6DAA6D;YAC7D,EAAE;SACF,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC;YAC1B,IAAI,EAAE,mEAAmE;YACzE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC/B,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,wBAAwB,GAAG,IAAA,yBAAc,EAAC,oBAAoB,CAAC,CAAC;AAEzD,QAAA,2BAA2B,GAAG,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACzF,OAAO,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;SAClC,IAAI,CAAC,wBAAwB,EAAE,CAAC;SAChC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACrF,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;SAC9C,IAAI,CAAC,wBAAwB,EAAE,CAAC;SAChC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3C,OAAO,KAAK,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;SACnD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1B,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts index d5cd1966221..d5da3f1cd89 100644 --- a/build/lib/compilation.ts +++ b/build/lib/compilation.ts @@ -17,7 +17,7 @@ import * as os from 'os'; import ts = require('typescript'); import * as File from 'vinyl'; import * as task from './task'; -import { Mangler } from './mangleTypeScript'; +import { Mangler } from './mangle/index'; import { RawSourceMap } from 'source-map'; const watch = require('./watch'); @@ -124,21 +124,22 @@ export function compileTask(src: string, out: string, build: boolean, options: { // mangle: TypeScript to TypeScript let mangleStream = es.through(); if (build && !options.disableMangle) { - let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data)); + let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true }); const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState'])); - mangleStream = es.through(function write(data: File & { sourceMap?: RawSourceMap }) { + mangleStream = es.through(async function write(data: File & { sourceMap?: RawSourceMap }) { type TypeScriptExt = typeof ts & { normalizePath(path: string): string }; const tsNormalPath = (ts).normalizePath(data.path); - const newContents = newContentsByFileName.get(tsNormalPath); + const newContents = (await newContentsByFileName).get(tsNormalPath); if (newContents !== undefined) { data.contents = Buffer.from(newContents.out); data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap); } this.push(data); - }, function end() { - this.push(null); + }, async function end() { // free resources - newContentsByFileName.clear(); + (await newContentsByFileName).clear(); + + this.push(null); (ts2tsMangler) = undefined; }); } diff --git a/build/lib/electron.js b/build/lib/electron.js index 73890d433b2..f06445d87fa 100644 --- a/build/lib/electron.js +++ b/build/lib/electron.js @@ -75,8 +75,10 @@ function darwinBundleDocumentTypes(types, icon) { }; }); } +const { electronVersion, msBuildId } = util.getElectronVersion(); exports.config = { - version: product.electronRepository ? '22.5.2' : util.getElectronVersion(), + version: electronVersion, + tag: product.electronRepository ? `v${electronVersion}-${msBuildId}` : undefined, productAppName: product.nameLong, companyName: 'Microsoft Corporation', copyright: 'Copyright (C) 2023 Microsoft. All rights reserved', @@ -173,7 +175,9 @@ exports.config = { linuxExecutableName: product.applicationName, winIcon: 'resources/win32/code.ico', token: process.env['GITHUB_TOKEN'], - repo: product.electronRepository || undefined + repo: product.electronRepository || undefined, + validateChecksum: true, + checksumFile: path.join(root, 'build', 'checksums', 'electron.txt'), }; function getElectron(arch) { return () => { @@ -193,7 +197,7 @@ function getElectron(arch) { }; } async function main(arch = process.arch) { - const version = product.electronRepository ? '22.5.2' : util.getElectronVersion(); + const version = electronVersion; const electronPath = path.join(root, '.build', 'electron'); const versionFile = path.join(electronPath, 'version'); const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`; @@ -208,4 +212,4 @@ if (require.main === module) { process.exit(1); }); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"electron.js","sourceRoot":"","sources":["electron.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,yBAAyB;AACzB,6BAA6B;AAC7B,gCAAgC;AAChC,sCAAsC;AACtC,gCAAgC;AAChC,+BAA+B;AAC/B,6CAA0C;AAY1C,SAAS,gBAAgB,CAAC,GAAY;IACrC,OAAO,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,aAAa,CAAC;AAC1F,CAAC;AAED,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AACrF,MAAM,MAAM,GAAG,IAAA,uBAAU,EAAC,IAAI,CAAC,CAAC;AAEhC,MAAM,qBAAqB,GAAG,OAAO,CAAC,aAAa,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAEnI;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAS,wBAAwB,CAAC,UAAoB,EAAE,IAAY,EAAE,YAA4C,EAAE,IAAe;IAClI,2FAA2F;IAC3F,IAAI,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,EAAE;QACpD,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,YAAY,IAAI,UAAU,CAAC,CAAC;KACjG;IAED,OAAO;QACN,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QACzC,UAAU;QACV,QAAQ,EAAE,mBAAmB,GAAG,IAAI,GAAG,OAAO;QAC9C,IAAI;KACJ,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,yBAAyB,CAAC,KAA4C,EAAE,IAAY;IAC5F,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAY,EAAsB,EAAE;QAClE,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO;YACN,IAAI;YACJ,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YACzC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YACjE,QAAQ,EAAE,mBAAmB,GAAG,IAAI,GAAG,OAAO;SACxB,CAAC;IACzB,CAAC,CAAC,CAAC;AACJ,CAAC;AAEY,QAAA,MAAM,GAAG;IACrB,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE;IAC1E,cAAc,EAAE,OAAO,CAAC,QAAQ;IAChC,WAAW,EAAE,uBAAuB;IACpC,SAAS,EAAE,mDAAmD;IAC9D,UAAU,EAAE,4BAA4B;IACxC,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;IACtD,6BAA6B,EAAE,qCAAqC;IACpE,oBAAoB,EAAE,kBAAkB;IACxC,kBAAkB,EAAE,kBAAkB;IACtC,yBAAyB,EAAE;QAC1B,GAAG,yBAAyB,CAAC,EAAE,eAAe,EAAE,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC;QACjF,GAAG,yBAAyB,CAAC,EAAE,wBAAwB,EAAE,CAAC,eAAe,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC;QACjH,GAAG,yBAAyB,CAAC,EAAE,wBAAwB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC;QAC/H,wBAAwB,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,wBAAwB,CAAC;QACzE,wBAAwB,CAAC,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAC9C,wBAAwB,CAAC,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,QAAQ,EAAE,oBAAoB,CAAC;QAClG,wBAAwB,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,iBAAiB,CAAC;QAC/E,wBAAwB,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,iBAAiB,CAAC;QAC/E,wBAAwB,CAAC,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,yBAAyB,CAAC;QACrE,wBAAwB,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,2BAA2B,CAAC;QACpE,wBAAwB,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC;QACnE,wBAAwB,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC;QAC/C,wBAAwB,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,CAAC;QACxD,wBAAwB,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAC1D,wBAAwB,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAC1C,wBAAwB,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QACjD,wBAAwB,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC;QAC1F,wBAAwB,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAC1C,wBAAwB,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAC1C,wBAAwB,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC;QACnH,wBAAwB,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC;QACvD,wBAAwB,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC;QACzE,wBAAwB,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC;QAC3D,wBAAwB,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC;QACzE,wBAAwB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC;QAC1D,wBAAwB,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC;QAClD,wBAAwB,CAAC,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC;QACtD,wBAAwB,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC;QAChE,wBAAwB,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC;QACvD,wBAAwB,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC;QACvG,wBAAwB,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAClE,wBAAwB,CAAC;YACxB,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ;YAC7D,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS;YAC5D,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO;SACpC,EAAE,OAAO,EAAE,QAAQ,CAAC;QACrB,oCAAoC;QACpC,GAAG,yBAAyB,CAAC;YAC5B,qBAAqB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC;YACzD,wBAAwB,EAAE,gBAAgB;YAC1C,0BAA0B,EAAE,QAAQ;YACpC,wBAAwB,EAAE,KAAK;YAC/B,cAAc,EAAE,OAAO;YACvB,aAAa,EAAE,MAAM;YACrB,WAAW,EAAE,MAAM;YACnB,YAAY,EAAE,YAAY;YAC1B,aAAa,EAAE,QAAQ;YACvB,eAAe,EAAE,QAAQ;YACzB,UAAU,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC;YAC9B,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,KAAK;YACrB,SAAS,EAAE,OAAO;YAClB,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,KAAK;YACjB,iBAAiB,EAAE,KAAK;YACxB,oBAAoB,EAAE,WAAW;YACjC,sBAAsB,EAAE,aAAa;YACrC,qBAAqB,EAAE,IAAI;YAC3B,eAAe,EAAE,GAAG;YACpB,kBAAkB,EAAE,IAAI;YACxB,4BAA4B,EAAE,KAAK;YACnC,gBAAgB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;YAChC,gBAAgB,EAAE,IAAI;YACtB,mBAAmB,EAAE,KAAK;YAC1B,WAAW,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC;YAChC,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;YAC/B,eAAe,EAAE,MAAM;YACvB,mBAAmB,EAAE,OAAO;SAC5B,EAAE,SAAS,CAAC;QACb,iCAAiC;QACjC,wBAAwB,CAAC;YACxB,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK;YACtE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;SACtE,EAAE,SAAS,EAAE,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC;QAC7C,oBAAoB;QACpB,wBAAwB,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,eAAe,CAAC,CAAC;KACpE;IACD,oBAAoB,EAAE,CAAC;YACtB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO,CAAC,QAAQ;YACtB,UAAU,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC;SACjC,CAAC;IACF,0BAA0B,EAAE,IAAI;IAChC,aAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;IACzI,mBAAmB,EAAE,OAAO,CAAC,eAAe;IAC5C,OAAO,EAAE,0BAA0B;IACnC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IAClC,IAAI,EAAE,OAAO,CAAC,kBAAkB,IAAI,SAAS;CAC7C,CAAC;AAEF,SAAS,WAAW,CAAC,IAAY;IAChC,OAAO,GAAG,EAAE;QACX,MAAM,QAAQ,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAsC,CAAC;QAE9E,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,cAAM,EAAE;YACzC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YACrC,cAAc,EAAE,KAAK;YACrB,cAAc,EAAE,IAAI;SACpB,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;aAC5B,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;aACvC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;aAC5B,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC;aAC5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC;AACH,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI;IACtC,MAAM,OAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAClF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,KAAK,GAAG,OAAO,EAAE,CAAC;IAEvG,IAAI,CAAC,UAAU,EAAE;QAChB,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KAChD;AACF,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IAC5B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACjC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;CACH"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"electron.js","sourceRoot":"","sources":["electron.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,yBAAyB;AACzB,6BAA6B;AAC7B,gCAAgC;AAChC,sCAAsC;AACtC,gCAAgC;AAChC,+BAA+B;AAC/B,6CAA0C;AAY1C,SAAS,gBAAgB,CAAC,GAAY;IACrC,OAAO,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,aAAa,CAAC;AAC1F,CAAC;AAED,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AACrF,MAAM,MAAM,GAAG,IAAA,uBAAU,EAAC,IAAI,CAAC,CAAC;AAEhC,MAAM,qBAAqB,GAAG,OAAO,CAAC,aAAa,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAEnI;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAS,wBAAwB,CAAC,UAAoB,EAAE,IAAY,EAAE,YAA4C,EAAE,IAAe;IAClI,2FAA2F;IAC3F,IAAI,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,EAAE;QACpD,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,YAAY,IAAI,UAAU,CAAC,CAAC;KACjG;IAED,OAAO;QACN,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QACzC,UAAU;QACV,QAAQ,EAAE,mBAAmB,GAAG,IAAI,GAAG,OAAO;QAC9C,IAAI;KACJ,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,yBAAyB,CAAC,KAA4C,EAAE,IAAY;IAC5F,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAY,EAAsB,EAAE;QAClE,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO;YACN,IAAI;YACJ,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YACzC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YACjE,QAAQ,EAAE,mBAAmB,GAAG,IAAI,GAAG,OAAO;SACxB,CAAC;IACzB,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;AAEpD,QAAA,MAAM,GAAG;IACrB,OAAO,EAAE,eAAe;IACxB,GAAG,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,eAAe,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS;IAChF,cAAc,EAAE,OAAO,CAAC,QAAQ;IAChC,WAAW,EAAE,uBAAuB;IACpC,SAAS,EAAE,mDAAmD;IAC9D,UAAU,EAAE,4BAA4B;IACxC,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;IACtD,6BAA6B,EAAE,qCAAqC;IACpE,oBAAoB,EAAE,kBAAkB;IACxC,kBAAkB,EAAE,kBAAkB;IACtC,yBAAyB,EAAE;QAC1B,GAAG,yBAAyB,CAAC,EAAE,eAAe,EAAE,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC;QACjF,GAAG,yBAAyB,CAAC,EAAE,wBAAwB,EAAE,CAAC,eAAe,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC;QACjH,GAAG,yBAAyB,CAAC,EAAE,wBAAwB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC;QAC/H,wBAAwB,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,wBAAwB,CAAC;QACzE,wBAAwB,CAAC,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAC9C,wBAAwB,CAAC,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,QAAQ,EAAE,oBAAoB,CAAC;QAClG,wBAAwB,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,iBAAiB,CAAC;QAC/E,wBAAwB,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,iBAAiB,CAAC;QAC/E,wBAAwB,CAAC,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,yBAAyB,CAAC;QACrE,wBAAwB,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,2BAA2B,CAAC;QACpE,wBAAwB,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC;QACnE,wBAAwB,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC;QAC/C,wBAAwB,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,CAAC;QACxD,wBAAwB,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAC1D,wBAAwB,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAC1C,wBAAwB,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QACjD,wBAAwB,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC;QAC1F,wBAAwB,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAC1C,wBAAwB,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAC1C,wBAAwB,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC;QACnH,wBAAwB,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC;QACvD,wBAAwB,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC;QACzE,wBAAwB,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC;QAC3D,wBAAwB,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC;QACzE,wBAAwB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC;QAC1D,wBAAwB,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC;QAClD,wBAAwB,CAAC,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC;QACtD,wBAAwB,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC;QAChE,wBAAwB,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC;QACvD,wBAAwB,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC;QACvG,wBAAwB,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAClE,wBAAwB,CAAC;YACxB,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ;YAC7D,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS;YAC5D,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO;SACpC,EAAE,OAAO,EAAE,QAAQ,CAAC;QACrB,oCAAoC;QACpC,GAAG,yBAAyB,CAAC;YAC5B,qBAAqB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC;YACzD,wBAAwB,EAAE,gBAAgB;YAC1C,0BAA0B,EAAE,QAAQ;YACpC,wBAAwB,EAAE,KAAK;YAC/B,cAAc,EAAE,OAAO;YACvB,aAAa,EAAE,MAAM;YACrB,WAAW,EAAE,MAAM;YACnB,YAAY,EAAE,YAAY;YAC1B,aAAa,EAAE,QAAQ;YACvB,eAAe,EAAE,QAAQ;YACzB,UAAU,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC;YAC9B,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,KAAK;YACrB,SAAS,EAAE,OAAO;YAClB,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,KAAK;YACjB,iBAAiB,EAAE,KAAK;YACxB,oBAAoB,EAAE,WAAW;YACjC,sBAAsB,EAAE,aAAa;YACrC,qBAAqB,EAAE,IAAI;YAC3B,eAAe,EAAE,GAAG;YACpB,kBAAkB,EAAE,IAAI;YACxB,4BAA4B,EAAE,KAAK;YACnC,gBAAgB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;YAChC,gBAAgB,EAAE,IAAI;YACtB,mBAAmB,EAAE,KAAK;YAC1B,WAAW,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC;YAChC,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;YAC/B,eAAe,EAAE,MAAM;YACvB,mBAAmB,EAAE,OAAO;SAC5B,EAAE,SAAS,CAAC;QACb,iCAAiC;QACjC,wBAAwB,CAAC;YACxB,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK;YACtE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;SACtE,EAAE,SAAS,EAAE,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC;QAC7C,oBAAoB;QACpB,wBAAwB,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,eAAe,CAAC,CAAC;KACpE;IACD,oBAAoB,EAAE,CAAC;YACtB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO,CAAC,QAAQ;YACtB,UAAU,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC;SACjC,CAAC;IACF,0BAA0B,EAAE,IAAI;IAChC,aAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;IACzI,mBAAmB,EAAE,OAAO,CAAC,eAAe;IAC5C,OAAO,EAAE,0BAA0B;IACnC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IAClC,IAAI,EAAE,OAAO,CAAC,kBAAkB,IAAI,SAAS;IAC7C,gBAAgB,EAAE,IAAI;IACtB,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,CAAC;CACnE,CAAC;AAEF,SAAS,WAAW,CAAC,IAAY;IAChC,OAAO,GAAG,EAAE;QACX,MAAM,QAAQ,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAsC,CAAC;QAE9E,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,cAAM,EAAE;YACzC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YACrC,cAAc,EAAE,KAAK;YACrB,cAAc,EAAE,IAAI;SACpB,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;aAC5B,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;aACvC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;aAC5B,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC;aAC5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC;AACH,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI;IACtC,MAAM,OAAO,GAAG,eAAe,CAAC;IAChC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,KAAK,GAAG,OAAO,EAAE,CAAC;IAEvG,IAAI,CAAC,UAAU,EAAE;QAChB,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KAChD;AACF,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IAC5B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACjC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;CACH"} \ No newline at end of file diff --git a/build/lib/electron.ts b/build/lib/electron.ts index 9f011c50889..0c3df8cfd71 100644 --- a/build/lib/electron.ts +++ b/build/lib/electron.ts @@ -90,8 +90,11 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] }, }); } +const { electronVersion, msBuildId } = util.getElectronVersion(); + export const config = { - version: product.electronRepository ? '22.5.2' : util.getElectronVersion(), + version: electronVersion, + tag: product.electronRepository ? `v${electronVersion}-${msBuildId}` : undefined, productAppName: product.nameLong, companyName: 'Microsoft Corporation', copyright: 'Copyright (C) 2023 Microsoft. All rights reserved', @@ -188,7 +191,9 @@ export const config = { linuxExecutableName: product.applicationName, winIcon: 'resources/win32/code.ico', token: process.env['GITHUB_TOKEN'], - repo: product.electronRepository || undefined + repo: product.electronRepository || undefined, + validateChecksum: true, + checksumFile: path.join(root, 'build', 'checksums', 'electron.txt'), }; function getElectron(arch: string): () => NodeJS.ReadWriteStream { @@ -212,7 +217,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream { } async function main(arch = process.arch): Promise { - const version = product.electronRepository ? '22.5.2' : util.getElectronVersion(); + const version = electronVersion; const electronPath = path.join(root, '.build', 'electron'); const versionFile = path.join(electronPath, 'version'); const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`; diff --git a/build/lib/extensions.js b/build/lib/extensions.js index 2846438a7b3..5f6718411a5 100644 --- a/build/lib/extensions.js +++ b/build/lib/extensions.js @@ -24,8 +24,7 @@ const jsoncParser = require("jsonc-parser"); const dependencies_1 = require("./dependencies"); const builtInExtensions_1 = require("./builtInExtensions"); const getVersion_1 = require("./getVersion"); -const gulpRemoteSource_1 = require("./gulpRemoteSource"); -const github_1 = require("./github"); +const fetch_1 = require("./fetch"); const root = path.dirname(path.dirname(__dirname)); const commit = (0, getVersion_1.getVersion)(root); const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`; @@ -57,11 +56,11 @@ function updateExtensionPackageJSON(input, update) { })) .pipe(packageJsonFilter.restore); } -function fromLocal(extensionPath, forWeb) { +function fromLocal(extensionPath, forWeb, disableMangle) { const webpackConfigFileName = forWeb ? 'extension-browser.webpack.config.js' : 'extension.webpack.config.js'; const isWebPacked = fs.existsSync(path.join(extensionPath, webpackConfigFileName)); let input = isWebPacked - ? fromLocalWebpack(extensionPath, webpackConfigFileName) + ? fromLocalWebpack(extensionPath, webpackConfigFileName, disableMangle) : fromLocalNormal(extensionPath); if (isWebPacked) { input = updateExtensionPackageJSON(input, (data) => { @@ -76,7 +75,7 @@ function fromLocal(extensionPath, forWeb) { } return input; } -function fromLocalWebpack(extensionPath, webpackConfigFileName) { +function fromLocalWebpack(extensionPath, webpackConfigFileName, disableMangle) { const vsce = require('@vscode/vsce'); const webpack = require('webpack'); const webpackGulp = require('webpack-stream'); @@ -123,6 +122,19 @@ function fromLocalWebpack(extensionPath, webpackConfigFileName) { ...config, ...{ mode: 'production' } }; + if (disableMangle) { + if (Array.isArray(config.module.rules)) { + for (const rule of config.module.rules) { + if (Array.isArray(rule.use)) { + for (const use of rule.use) { + if (String(use.loader).endsWith('mangle-loader.js')) { + use.options.disabled = true; + } + } + } + } + } + } const relativeOutputPath = path.relative(extensionPath, webpackConfig.output.path); return webpackGulp(webpackConfig, webpack, webpackDone) .pipe(es.through(function (data) { @@ -180,19 +192,19 @@ const baseHeaders = { 'User-Agent': userAgent, 'X-Market-User-Id': '291C1CD0-051A-4123-9B4B-30D60EF52EE2', }; -function fromMarketplace(serviceUrl, { name: extensionName, version, metadata }) { +function fromMarketplace(serviceUrl, { name: extensionName, version, sha256, metadata }) { const json = require('gulp-json-editor'); const [publisher, name] = extensionName.split('.'); const url = `${serviceUrl}/publishers/${publisher}/vsextensions/${name}/${version}/vspackage`; fancyLog('Downloading extension:', ansiColors.yellow(`${extensionName}@${version}`), '...'); - const options = { - base: url, - fetchOptions: { - headers: baseHeaders - } - }; const packageJsonFilter = filter('package.json', { restore: true }); - return (0, gulpRemoteSource_1.remote)('', options) + return (0, fetch_1.fetchUrls)('', { + base: url, + nodeFetchOptions: { + headers: baseHeaders + }, + checksumSha256: sha256 + }) .pipe(vzip.src()) .pipe(filter('extension/**')) .pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, ''))) @@ -202,11 +214,15 @@ function fromMarketplace(serviceUrl, { name: extensionName, version, metadata }) .pipe(packageJsonFilter.restore); } exports.fromMarketplace = fromMarketplace; -function fromGithub({ name, version, repo, metadata }) { +function fromGithub({ name, version, repo, sha256, metadata }) { const json = require('gulp-json-editor'); fancyLog('Downloading extension from GH:', ansiColors.yellow(`${name}@${version}`), '...'); const packageJsonFilter = filter('package.json', { restore: true }); - return (0, github_1.assetFromGithub)(new URL(repo).pathname, version, name => name.endsWith('.vsix')) + return (0, fetch_1.fetchGithub)(new URL(repo).pathname, { + version, + name: name => name.endsWith('.vsix'), + checksumSha256: sha256 + }) .pipe(buffer()) .pipe(vzip.src()) .pipe(filter('extension/**')) @@ -260,7 +276,7 @@ function isWebExtension(manifest) { } return true; } -function packageLocalExtensionsStream(forWeb) { +function packageLocalExtensionsStream(forWeb, disableMangle) { const localExtensionsDescriptions = (glob.sync('extensions/*/package.json') .map(manifestPath => { const absoluteManifestPath = path.join(root, manifestPath); @@ -272,7 +288,7 @@ function packageLocalExtensionsStream(forWeb) { .filter(({ name }) => builtInExtensions.every(b => b.name !== name)) .filter(({ manifestPath }) => (forWeb ? isWebExtension(require(manifestPath)) : true))); const localExtensionsStream = minifyExtensionResources(es.merge(...localExtensionsDescriptions.map(extension => { - return fromLocal(extension.path, forWeb) + return fromLocal(extension.path, forWeb, disableMangle) .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`)); }))); let result; @@ -284,7 +300,8 @@ function packageLocalExtensionsStream(forWeb) { const productionDependencies = (0, dependencies_1.getProductionDependencies)('extensions/'); const dependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat(); result = es.merge(localExtensionsStream, gulp.src(dependenciesSrc, { base: '.' }) - .pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore')))); + .pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore'))) + .pipe(util2.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`)))); } return (result .pipe(util2.setExecutableBit(['**/*.sh']))); @@ -484,4 +501,4 @@ async function buildExtensionMedia(isWatch, outputRoot) { }))); } exports.buildExtensionMedia = buildExtensionMedia; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"extensions.js","sourceRoot":"","sources":["extensions.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,mCAAmC;AACnC,yBAAyB;AACzB,oCAAoC;AACpC,6BAA6B;AAC7B,6BAA6B;AAC7B,6BAA6B;AAE7B,8BAA8B;AAC9B,mCAA4C;AAC5C,gCAAgC;AAChC,MAAM,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACvC,sCAAuC;AACvC,sCAAuC;AACvC,sCAAsC;AACtC,0CAA0C;AAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACtC,4CAA4C;AAE5C,iDAA2D;AAC3D,2DAAyD;AACzD,6CAA0C;AAC1C,yDAA2E;AAC3E,qCAA2C;AAE3C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,MAAM,MAAM,GAAG,IAAA,uBAAU,EAAC,IAAI,CAAC,CAAC;AAChC,MAAM,oBAAoB,GAAG,mDAAmD,MAAM,EAAE,CAAC;AAEzF,SAAS,wBAAwB,CAAC,KAAa;IAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,WAAW,EAAE,oBAAoB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,OAAO,KAAK;SACV,IAAI,CAAC,UAAU,CAAC;SAChB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,MAAM,GAA6B,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QACnG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,mEAAmE;YACnE,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;SAChD;QACD,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;SACF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAa,EAAE,MAA0B;IAC5E,MAAM,iBAAiB,GAAG,MAAM,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACjF,OAAO,KAAK;SACV,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACrD,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;SACF,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,SAAS,CAAC,aAAqB,EAAE,MAAe;IACxD,MAAM,qBAAqB,GAAG,MAAM,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,6BAA6B,CAAC;IAE7G,MAAM,WAAW,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC;IACnF,IAAI,KAAK,GAAG,WAAW;QACtB,CAAC,CAAC,gBAAgB,CAAC,aAAa,EAAE,qBAAqB,CAAC;QACxD,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;IAElC,IAAI,WAAW,EAAE;QAChB,KAAK,GAAG,0BAA0B,CAAC,KAAK,EAAE,CAAC,IAAS,EAAE,EAAE;YACvD,OAAO,IAAI,CAAC,OAAO,CAAC;YACpB,OAAO,IAAI,CAAC,YAAY,CAAC;YACzB,OAAO,IAAI,CAAC,eAAe,CAAC;YAC5B,IAAI,IAAI,CAAC,IAAI,EAAE;gBACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aACjD;YACD,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;KACH;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAGD,SAAS,gBAAgB,CAAC,aAAqB,EAAE,qBAA6B;IAC7E,MAAM,IAAI,GAAG,OAAO,CAAC,cAAc,CAAkC,CAAC;IACtE,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE5B,MAAM,oBAAoB,GAAa,EAAE,CAAC;IAC1C,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,IAAI,iBAAiB,CAAC,YAAY,EAAE;QACnC,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACnF,KAAK,MAAM,GAAG,IAAI,iBAAiB,CAAC,SAAS,EAAE;YAC9C,IAAI,GAAG,IAAI,iBAAiB,CAAC,YAAY,EAAE;gBAC1C,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/B;SACD;KACD;IAED,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QACvH,MAAM,KAAK,GAAG,SAAS;aACrB,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;aACnD,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;YACzB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAQ;SAC9C,CAAC,CAAC,CAAC;QAEL,+DAA+D;QAC/D,8CAA8C;QAC9C,MAAM,sBAAsB,GAAc,IAAI,CAAC,IAAI,CAClD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,qBAAqB,CAAC,EACrD,EAAE,MAAM,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAC9B,CAAC;QAEH,MAAM,cAAc,GAAG,sBAAsB,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YAEzE,MAAM,WAAW,GAAG,CAAC,GAAQ,EAAE,KAAU,EAAE,EAAE;gBAC5C,QAAQ,CAAC,sBAAsB,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACjJ,IAAI,GAAG,EAAE;oBACR,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAC1B;gBACD,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;gBAC9B,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACpD;gBACD,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACtD;YACF,CAAC,CAAC;YAEF,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAClD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACvF,MAAM,aAAa,GAAG;oBACrB,GAAG,MAAM;oBACT,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE;iBACzB,CAAC;gBACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAEnF,OAAO,WAAW,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,CAAC;qBACrD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI;oBAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;oBAC5B,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;oBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;qBACF,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,IAAU;oBACpC,uBAAuB;oBACvB,6BAA6B;oBAC7B,mDAAmD;oBACnD,MAAM,QAAQ,GAAY,IAAI,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBAC1D,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kCAAkC,EAAE,UAAU,EAAE,EAAE,EAAE;wBAChG,OAAO,0BAA0B,oBAAoB,eAAe,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,kBAAkB,IAAI,EAAE,EAAE,CAAC;oBAChI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;oBAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,KAAK,CAAC,GAAG,cAAc,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC/C,qCAAqC;YACrC,YAAY;YACZ,wDAAwD;YACxD,4BAA4B;YAC5B,MAAM;aACL,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC7B,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,eAAe,CAAC,aAAqB;IAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,cAAc,CAAkC,CAAC;IACtE,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE5B,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;SAC9E,IAAI,CAAC,SAAS,CAAC,EAAE;QACjB,MAAM,KAAK,GAAG,SAAS;aACrB,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;aACnD,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;YACzB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAQ;SAC9C,CAAC,CAAC,CAAC;QAEL,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC,CAAC;SACD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAE1C,OAAO,MAAM,CAAC,IAAI,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,SAAS,GAAG,cAAc,CAAC;AACjC,MAAM,WAAW,GAAG;IACnB,oBAAoB,EAAE,cAAc;IACpC,YAAY,EAAE,SAAS;IACvB,kBAAkB,EAAE,sCAAsC;CAC1D,CAAC;AAEF,SAAgB,eAAe,CAAC,UAAkB,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAqB;IAChH,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAsC,CAAC;IAE9E,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,GAAG,GAAG,GAAG,UAAU,eAAe,SAAS,iBAAiB,IAAI,IAAI,OAAO,YAAY,CAAC;IAE9F,QAAQ,CAAC,wBAAwB,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,aAAa,IAAI,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAE5F,MAAM,OAAO,GAAsB;QAClC,IAAI,EAAE,GAAG;QACT,YAAY,EAAE;YACb,OAAO,EAAE,WAAW;SACpB;KACD,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpE,OAAO,IAAA,yBAAM,EAAC,EAAE,EAAE,OAAO,CAAC;SACxB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SAChB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC5B,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;SACtE,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;SACpC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAzBD,0CAyBC;AAGD,SAAgB,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAqB;IAC9E,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAsC,CAAC;IAE9E,QAAQ,CAAC,gCAAgC,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAE3F,MAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpE,OAAO,IAAA,wBAAe,EAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SACrF,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SAChB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC5B,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;SACtE,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;SACpC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAhBD,gCAgBC;AAED,MAAM,kBAAkB,GAAG;IAC1B,kBAAkB;IAClB,uBAAuB;IACvB,sBAAsB;IACtB,sBAAsB;IACtB,uBAAuB;CACvB,CAAC;AAEF,MAAM,+BAA+B,GAAG,IAAI,GAAG,CAAC;IAC/C,sBAAsB;IACtB,uBAAuB;IACvB,8BAA8B;IAC9B,oBAAoB;IACpB,mCAAmC;CACnC,CAAC,CAAC;AASH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AACpG,MAAM,iBAAiB,GAAwB,WAAW,CAAC,iBAAiB,IAAI,EAAE,CAAC;AACnF,MAAM,oBAAoB,GAAwB,WAAW,CAAC,oBAAoB,IAAI,EAAE,CAAC;AAWzF;;GAEG;AACH,SAAS,cAAc,CAAC,QAA4B;IACnD,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC;KACZ;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC3B,OAAO,KAAK,CAAC;KACb;IACD,2BAA2B;IAC3B,IAAI,OAAO,QAAQ,CAAC,aAAa,KAAK,WAAW,EAAE;QAClD,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAChH,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACtC,OAAO,IAAI,CAAC;SACZ;KACD;IACD,IAAI,OAAO,QAAQ,CAAC,WAAW,KAAK,WAAW,EAAE;QAChD,KAAK,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,yBAAyB,CAAC,EAAE;YACtE,IAAI,QAAQ,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE;gBAC5C,OAAO,KAAK,CAAC;aACb;SACD;KACD;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAgB,4BAA4B,CAAC,MAAe;IAC3D,MAAM,2BAA2B,GAAG,CACxB,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAE;SAChD,GAAG,CAAC,YAAY,CAAC,EAAE;QACnB,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;QAClE,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACnD,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACzF,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7D,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;SACnE,MAAM,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CACvF,CAAC;IACF,MAAM,qBAAqB,GAAG,wBAAwB,CACrD,EAAE,CAAC,KAAK,CACP,GAAG,2BAA2B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;QAC9C,OAAO,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;aACtC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,cAAc,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC,CACF,CACD,CAAC;IAEF,IAAI,MAAc,CAAC;IACnB,IAAI,MAAM,EAAE;QACX,MAAM,GAAG,qBAAqB,CAAC;KAC/B;SAAM;QACN,8CAA8C;QAC9C,MAAM,sBAAsB,GAAG,IAAA,wCAAyB,EAAC,aAAa,CAAC,CAAC;QACxE,MAAM,eAAe,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAE9I,MAAM,GAAG,EAAE,CAAC,KAAK,CAChB,qBAAqB,EACrB,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;aACtC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5E;IAED,OAAO,CACN,MAAM;SACJ,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3C,CAAC;AACH,CAAC;AAxCD,oEAwCC;AAED,SAAgB,kCAAkC,CAAC,MAAe;IACjE,MAAM,iCAAiC,GAAG;QACzC,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,+BAA+B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACvG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;KACvC,CAAC;IACF,MAAM,2BAA2B,GAAG,wBAAwB,CAC3D,EAAE,CAAC,KAAK,CACP,GAAG,iCAAiC;SAClC,GAAG,CAAC,SAAS,CAAC,EAAE;QAChB,MAAM,GAAG,GAAG,IAAA,sCAAkB,EAAC,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACnG,OAAO,0BAA0B,CAAC,GAAG,EAAE,CAAC,IAAS,EAAE,EAAE;YACpD,OAAO,IAAI,CAAC,OAAO,CAAC;YACpB,OAAO,IAAI,CAAC,YAAY,CAAC;YACzB,OAAO,IAAI,CAAC,eAAe,CAAC;YAC5B,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CACH,CACD,CAAC;IAEF,OAAO,CACN,2BAA2B;SACzB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3C,CAAC;AACH,CAAC;AAxBD,gFAwBC;AAUD,SAAgB,qBAAqB,CAAC,cAAsB,EAAE,UAAoB,EAAE;IACnF,MAAM,iBAAiB,GAA+B,EAAE,CAAC;IAEzD,IAAI;QACH,MAAM,iBAAiB,GAAG,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QACzD,KAAK,MAAM,eAAe,IAAI,iBAAiB,EAAE;YAChD,IAAI,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;gBAC1C,SAAS;aACT;YACD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;YACnF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBACpC,SAAS;aACT;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAClF,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;gBACjC,SAAS;aACT;YACD,MAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC;YAC5E,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;YACjF,MAAM,UAAU,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACnJ,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjF,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEvF,iBAAiB,CAAC,IAAI,CAAC;gBACtB,aAAa,EAAE,eAAe;gBAC9B,WAAW;gBACX,UAAU;gBACV,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;gBACnE,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;aAC5E,CAAC,CAAC;SACH;QACD,OAAO,iBAAiB,CAAC;KACzB;IAAC,OAAO,EAAE,EAAE;QACZ,OAAO,iBAAiB,CAAC;KACzB;AACF,CAAC;AAnCD,sDAmCC;AAED,SAAgB,oBAAoB,CAAC,WAAmB,EAAE,cAAsB;IAI/E,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,UAAU,GAAc,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrF,MAAM,SAAS,GAAG,CAAC,GAAQ,EAAE,EAAE;QAC9B,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;YACtB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YACrB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACvB,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aACvB;iBAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC1C,SAAS,CAAC,GAAG,CAAC,CAAC;aACf;iBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,WAAW,EAAE;gBAC1H,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC7D,IAAI,UAAU,EAAE;oBACf,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;iBAC7H;aACD;SACD;IACF,CAAC,CAAC;IACF,SAAS,CAAC,WAAW,CAAC,CAAC;IACvB,OAAO,WAAW,CAAC;AACpB,CAAC;AAvBD,oDAuBC;AAED,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AAErD,iFAAiF;AACjF,MAAM,mBAAmB,GAAG;IAC3B,gDAAgD;IAChD,+CAA+C;IAC/C,0BAA0B;IAC1B,+BAA+B;IAC/B,kBAAkB;IAClB,mCAAmC;CACnC,CAAC;AAEK,KAAK,UAAU,iBAAiB,CAAC,QAAgB,EAAE,OAAgB,EAAE,sBAAqE;IAChJ,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAA6B,CAAC;IAE/D,MAAM,cAAc,GAA4B,EAAE,CAAC;IAEnD,KAAK,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,sBAAsB,EAAE;QAChE,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9C,SAAS,SAAS,CAAC,iBAA6H;YAC/I,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EAAE;gBACpG,MAAM,MAAM,GAAG,OAAO,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;gBAClF,IAAI,UAAU,EAAE;oBACf,MAAM,CAAC,MAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAO,CAAC,IAAK,CAAC,CAAC,CAAC;iBAC3G;gBACD,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC5B;QACF,CAAC;QACD,SAAS,CAAC,iBAAiB,CAAC,CAAC;KAC7B;IACD,SAAS,QAAQ,CAAC,SAAc;QAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;YACtC,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,QAAQ,EAAE;gBACvC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;gBACpC,IAAI,UAAU,EAAE;oBACf,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;oBACnF,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;oBAC/D,QAAQ,CAAC,YAAY,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,MAAM,UAAU,CAAC,CAAC;iBACrH;gBACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;oBAChC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;wBACnC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACvB,CAAC,CAAC,CAAC;iBACH;gBACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;oBAClC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;wBACvC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACxB,CAAC,CAAC,CAAC;iBACH;aACD;SACD;IACF,CAAC;IACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,IAAI,OAAO,EAAE;YACZ,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAChD,IAAI,GAAG,EAAE;oBACR,MAAM,EAAE,CAAC;iBACT;qBAAM;oBACN,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;iBAC1B;YACF,CAAC,CAAC,CAAC;SACH;aAAM;YACN,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC1C,IAAI,GAAG,EAAE;oBACR,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACpB,MAAM,EAAE,CAAC;iBACT;qBAAM;oBACN,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC1B,OAAO,EAAE,CAAC;iBACV;YACF,CAAC,CAAC,CAAC;SACH;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AA7DD,8CA6DC;AAED,KAAK,UAAU,iBAAiB,CAAC,QAAgB,EAAE,OAAgB,EAAE,OAAkD;IACtH,SAAS,QAAQ,CAAC,QAAgB,EAAE,MAAc;QACjD,MAAM,OAAO,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACjE,QAAQ,CAAC,YAAY,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,MAAM,SAAS,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC1G,KAAK,MAAM,KAAK,IAAI,OAAO,IAAI,EAAE,EAAE;YAClC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACtB;IACF,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QACpD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;YACtB,IAAI,OAAO,EAAE;gBACZ,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACrB;YACD,IAAI,UAAU,EAAE;gBACf,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;aACtC;YACD,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9E,IAAI,KAAK,EAAE;oBACV,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;iBACrB;gBACD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBACzB,IAAI,MAAM,EAAE;oBACX,OAAO,MAAM,EAAE,CAAC;iBAChB;gBACD,OAAO,OAAO,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,QAAQ,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAC,OAAgB,EAAE,UAAmB;IAC9E,OAAO,iBAAiB,CAAC,4BAA4B,EAAE,OAAO,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7F,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;QACpC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;KACjF,CAAC,CAAC,CAAC,CAAC;AACN,CAAC;AALD,kDAKC"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"extensions.js","sourceRoot":"","sources":["extensions.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,mCAAmC;AACnC,yBAAyB;AACzB,oCAAoC;AACpC,6BAA6B;AAC7B,6BAA6B;AAC7B,6BAA6B;AAE7B,8BAA8B;AAC9B,mCAA4C;AAC5C,gCAAgC;AAChC,MAAM,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACvC,sCAAuC;AACvC,sCAAuC;AACvC,sCAAsC;AACtC,0CAA0C;AAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACtC,4CAA4C;AAE5C,iDAA2D;AAC3D,2DAA+E;AAC/E,6CAA0C;AAC1C,mCAAiD;AAEjD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,MAAM,MAAM,GAAG,IAAA,uBAAU,EAAC,IAAI,CAAC,CAAC;AAChC,MAAM,oBAAoB,GAAG,mDAAmD,MAAM,EAAE,CAAC;AAEzF,SAAS,wBAAwB,CAAC,KAAa;IAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,WAAW,EAAE,oBAAoB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,OAAO,KAAK;SACV,IAAI,CAAC,UAAU,CAAC;SAChB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,MAAM,GAA6B,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QACnG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,mEAAmE;YACnE,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;SAChD;QACD,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;SACF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAa,EAAE,MAA0B;IAC5E,MAAM,iBAAiB,GAAG,MAAM,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACjF,OAAO,KAAK;SACV,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAO,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACrD,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;SACF,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,SAAS,CAAC,aAAqB,EAAE,MAAe,EAAE,aAAsB;IAChF,MAAM,qBAAqB,GAAG,MAAM,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,6BAA6B,CAAC;IAE7G,MAAM,WAAW,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC;IACnF,IAAI,KAAK,GAAG,WAAW;QACtB,CAAC,CAAC,gBAAgB,CAAC,aAAa,EAAE,qBAAqB,EAAE,aAAa,CAAC;QACvE,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;IAElC,IAAI,WAAW,EAAE;QAChB,KAAK,GAAG,0BAA0B,CAAC,KAAK,EAAE,CAAC,IAAS,EAAE,EAAE;YACvD,OAAO,IAAI,CAAC,OAAO,CAAC;YACpB,OAAO,IAAI,CAAC,YAAY,CAAC;YACzB,OAAO,IAAI,CAAC,eAAe,CAAC;YAC5B,IAAI,IAAI,CAAC,IAAI,EAAE;gBACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;aACjD;YACD,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;KACH;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAGD,SAAS,gBAAgB,CAAC,aAAqB,EAAE,qBAA6B,EAAE,aAAsB;IACrG,MAAM,IAAI,GAAG,OAAO,CAAC,cAAc,CAAkC,CAAC;IACtE,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE5B,MAAM,oBAAoB,GAAa,EAAE,CAAC;IAC1C,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,IAAI,iBAAiB,CAAC,YAAY,EAAE;QACnC,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACnF,KAAK,MAAM,GAAG,IAAI,iBAAiB,CAAC,SAAS,EAAE;YAC9C,IAAI,GAAG,IAAI,iBAAiB,CAAC,YAAY,EAAE;gBAC1C,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/B;SACD;KACD;IAED,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QACvH,MAAM,KAAK,GAAG,SAAS;aACrB,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;aACnD,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;YACzB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAQ;SAC9C,CAAC,CAAC,CAAC;QAEL,+DAA+D;QAC/D,8CAA8C;QAC9C,MAAM,sBAAsB,GAAc,IAAI,CAAC,IAAI,CAClD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,qBAAqB,CAAC,EACrD,EAAE,MAAM,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAC9B,CAAC;QAEH,MAAM,cAAc,GAAG,sBAAsB,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YAEzE,MAAM,WAAW,GAAG,CAAC,GAAQ,EAAE,KAAU,EAAE,EAAE;gBAC5C,QAAQ,CAAC,sBAAsB,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACjJ,IAAI,GAAG,EAAE;oBACR,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAC1B;gBACD,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;gBAC9B,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACpD;gBACD,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACtD;YACF,CAAC,CAAC;YAEF,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAClD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACvF,MAAM,aAAa,GAAG;oBACrB,GAAG,MAAM;oBACT,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE;iBACzB,CAAC;gBACF,IAAI,aAAa,EAAE;oBAClB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;wBACvC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE;4BACvC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gCAC5B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE;oCAC3B,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;wCACpD,GAAG,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;qCAC5B;iCACD;6BACD;yBACD;qBACD;iBACD;gBACD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAEnF,OAAO,WAAW,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,CAAC;qBACrD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI;oBAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;oBAC5B,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;oBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;qBACF,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,IAAU;oBACpC,uBAAuB;oBACvB,6BAA6B;oBAC7B,mDAAmD;oBACnD,MAAM,QAAQ,GAAY,IAAI,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBAC1D,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kCAAkC,EAAE,UAAU,EAAE,EAAE,EAAE;wBAChG,OAAO,0BAA0B,oBAAoB,eAAe,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,kBAAkB,IAAI,EAAE,EAAE,CAAC;oBAChI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;oBAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,KAAK,CAAC,GAAG,cAAc,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC/C,qCAAqC;YACrC,YAAY;YACZ,wDAAwD;YACxD,4BAA4B;YAC5B,MAAM;aACL,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC7B,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,eAAe,CAAC,aAAqB;IAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,cAAc,CAAkC,CAAC;IACtE,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE5B,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;SAC9E,IAAI,CAAC,SAAS,CAAC,EAAE;QACjB,MAAM,KAAK,GAAG,SAAS;aACrB,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;aACnD,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;YACzB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAQ;SAC9C,CAAC,CAAC,CAAC;QAEL,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC,CAAC;SACD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAE1C,OAAO,MAAM,CAAC,IAAI,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,SAAS,GAAG,cAAc,CAAC;AACjC,MAAM,WAAW,GAAG;IACnB,oBAAoB,EAAE,cAAc;IACpC,YAAY,EAAE,SAAS;IACvB,kBAAkB,EAAE,sCAAsC;CAC1D,CAAC;AAEF,SAAgB,eAAe,CAAC,UAAkB,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAwB;IAC3H,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAsC,CAAC;IAE9E,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,GAAG,GAAG,GAAG,UAAU,eAAe,SAAS,iBAAiB,IAAI,IAAI,OAAO,YAAY,CAAC;IAE9F,QAAQ,CAAC,wBAAwB,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,aAAa,IAAI,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAE5F,MAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpE,OAAO,IAAA,iBAAS,EAAC,EAAE,EAAE;QACpB,IAAI,EAAE,GAAG;QACT,gBAAgB,EAAE;YACjB,OAAO,EAAE,WAAW;SACpB;QACD,cAAc,EAAE,MAAM;KACtB,CAAC;SACA,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SAChB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC5B,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;SACtE,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;SACpC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAxBD,0CAwBC;AAGD,SAAgB,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAwB;IACzF,MAAM,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAsC,CAAC;IAE9E,QAAQ,CAAC,gCAAgC,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAE3F,MAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpE,OAAO,IAAA,mBAAW,EAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QAC1C,OAAO;QACP,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QACpC,cAAc,EAAE,MAAM;KACtB,CAAC;SACA,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SAChB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC5B,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;SACtE,IAAI,CAAC,iBAAiB,CAAC;SACvB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;SACpC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AApBD,gCAoBC;AAED,MAAM,kBAAkB,GAAG;IAC1B,kBAAkB;IAClB,uBAAuB;IACvB,sBAAsB;IACtB,sBAAsB;IACtB,uBAAuB;CACvB,CAAC;AAEF,MAAM,+BAA+B,GAAG,IAAI,GAAG,CAAC;IAC/C,sBAAsB;IACtB,uBAAuB;IACvB,8BAA8B;IAC9B,oBAAoB;IACpB,mCAAmC;CACnC,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AACpG,MAAM,iBAAiB,GAA2B,WAAW,CAAC,iBAAiB,IAAI,EAAE,CAAC;AACtF,MAAM,oBAAoB,GAA2B,WAAW,CAAC,oBAAoB,IAAI,EAAE,CAAC;AAW5F;;GAEG;AACH,SAAS,cAAc,CAAC,QAA4B;IACnD,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC;KACZ;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC3B,OAAO,KAAK,CAAC;KACb;IACD,2BAA2B;IAC3B,IAAI,OAAO,QAAQ,CAAC,aAAa,KAAK,WAAW,EAAE;QAClD,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAChH,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACtC,OAAO,IAAI,CAAC;SACZ;KACD;IACD,IAAI,OAAO,QAAQ,CAAC,WAAW,KAAK,WAAW,EAAE;QAChD,KAAK,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,yBAAyB,CAAC,EAAE;YACtE,IAAI,QAAQ,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE;gBAC5C,OAAO,KAAK,CAAC;aACb;SACD;KACD;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAgB,4BAA4B,CAAC,MAAe,EAAE,aAAsB;IACnF,MAAM,2BAA2B,GAAG,CACxB,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAE;SAChD,GAAG,CAAC,YAAY,CAAC,EAAE;QACnB,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;QAClE,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACnD,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACzF,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7D,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;SACnE,MAAM,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CACvF,CAAC;IACF,MAAM,qBAAqB,GAAG,wBAAwB,CACrD,EAAE,CAAC,KAAK,CACP,GAAG,2BAA2B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;QAC9C,OAAO,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC;aACrD,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,cAAc,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC,CACF,CACD,CAAC;IAEF,IAAI,MAAc,CAAC;IACnB,IAAI,MAAM,EAAE;QACX,MAAM,GAAG,qBAAqB,CAAC;KAC/B;SAAM;QACN,8CAA8C;QAC9C,MAAM,sBAAsB,GAAG,IAAA,wCAAyB,EAAC,aAAa,CAAC,CAAC;QACxE,MAAM,eAAe,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAE9I,MAAM,GAAG,EAAE,CAAC,KAAK,CAChB,qBAAqB,EACrB,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;aACtC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;aACvE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,iBAAiB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;KAChG;IAED,OAAO,CACN,MAAM;SACJ,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3C,CAAC;AACH,CAAC;AAzCD,oEAyCC;AAED,SAAgB,kCAAkC,CAAC,MAAe;IACjE,MAAM,iCAAiC,GAAG;QACzC,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,+BAA+B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACvG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;KACvC,CAAC;IACF,MAAM,2BAA2B,GAAG,wBAAwB,CAC3D,EAAE,CAAC,KAAK,CACP,GAAG,iCAAiC;SAClC,GAAG,CAAC,SAAS,CAAC,EAAE;QAChB,MAAM,GAAG,GAAG,IAAA,sCAAkB,EAAC,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACnG,OAAO,0BAA0B,CAAC,GAAG,EAAE,CAAC,IAAS,EAAE,EAAE;YACpD,OAAO,IAAI,CAAC,OAAO,CAAC;YACpB,OAAO,IAAI,CAAC,YAAY,CAAC;YACzB,OAAO,IAAI,CAAC,eAAe,CAAC;YAC5B,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CACH,CACD,CAAC;IAEF,OAAO,CACN,2BAA2B;SACzB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3C,CAAC;AACH,CAAC;AAxBD,gFAwBC;AAUD,SAAgB,qBAAqB,CAAC,cAAsB,EAAE,UAAoB,EAAE;IACnF,MAAM,iBAAiB,GAA+B,EAAE,CAAC;IAEzD,IAAI;QACH,MAAM,iBAAiB,GAAG,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QACzD,KAAK,MAAM,eAAe,IAAI,iBAAiB,EAAE;YAChD,IAAI,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;gBAC1C,SAAS;aACT;YACD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;YACnF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBACpC,SAAS;aACT;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAClF,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;gBACjC,SAAS;aACT;YACD,MAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC;YAC5E,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;YACjF,MAAM,UAAU,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACnJ,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjF,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEvF,iBAAiB,CAAC,IAAI,CAAC;gBACtB,aAAa,EAAE,eAAe;gBAC9B,WAAW;gBACX,UAAU;gBACV,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;gBACnE,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;aAC5E,CAAC,CAAC;SACH;QACD,OAAO,iBAAiB,CAAC;KACzB;IAAC,OAAO,EAAE,EAAE;QACZ,OAAO,iBAAiB,CAAC;KACzB;AACF,CAAC;AAnCD,sDAmCC;AAED,SAAgB,oBAAoB,CAAC,WAAmB,EAAE,cAAsB;IAI/E,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,UAAU,GAAc,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrF,MAAM,SAAS,GAAG,CAAC,GAAQ,EAAE,EAAE;QAC9B,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;YACtB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YACrB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACvB,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aACvB;iBAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC1C,SAAS,CAAC,GAAG,CAAC,CAAC;aACf;iBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,WAAW,EAAE;gBAC1H,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC7D,IAAI,UAAU,EAAE;oBACf,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;iBAC7H;aACD;SACD;IACF,CAAC,CAAC;IACF,SAAS,CAAC,WAAW,CAAC,CAAC;IACvB,OAAO,WAAW,CAAC;AACpB,CAAC;AAvBD,oDAuBC;AAED,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AAErD,iFAAiF;AACjF,MAAM,mBAAmB,GAAG;IAC3B,gDAAgD;IAChD,+CAA+C;IAC/C,0BAA0B;IAC1B,+BAA+B;IAC/B,kBAAkB;IAClB,mCAAmC;CACnC,CAAC;AAEK,KAAK,UAAU,iBAAiB,CAAC,QAAgB,EAAE,OAAgB,EAAE,sBAAqE;IAChJ,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAA6B,CAAC;IAE/D,MAAM,cAAc,GAA4B,EAAE,CAAC;IAEnD,KAAK,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,sBAAsB,EAAE;QAChE,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9C,SAAS,SAAS,CAAC,iBAA6H;YAC/I,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EAAE;gBACpG,MAAM,MAAM,GAAG,OAAO,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;gBAClF,IAAI,UAAU,EAAE;oBACf,MAAM,CAAC,MAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAO,CAAC,IAAK,CAAC,CAAC,CAAC;iBAC3G;gBACD,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC5B;QACF,CAAC;QACD,SAAS,CAAC,iBAAiB,CAAC,CAAC;KAC7B;IACD,SAAS,QAAQ,CAAC,SAAc;QAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;YACtC,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,QAAQ,EAAE;gBACvC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;gBACpC,IAAI,UAAU,EAAE;oBACf,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;oBACnF,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;oBAC/D,QAAQ,CAAC,YAAY,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,MAAM,UAAU,CAAC,CAAC;iBACrH;gBACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;oBAChC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;wBACnC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACvB,CAAC,CAAC,CAAC;iBACH;gBACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;oBAClC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;wBACvC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACxB,CAAC,CAAC,CAAC;iBACH;aACD;SACD;IACF,CAAC;IACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,IAAI,OAAO,EAAE;YACZ,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAChD,IAAI,GAAG,EAAE;oBACR,MAAM,EAAE,CAAC;iBACT;qBAAM;oBACN,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;iBAC1B;YACF,CAAC,CAAC,CAAC;SACH;aAAM;YACN,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC1C,IAAI,GAAG,EAAE;oBACR,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACpB,MAAM,EAAE,CAAC;iBACT;qBAAM;oBACN,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC1B,OAAO,EAAE,CAAC;iBACV;YACF,CAAC,CAAC,CAAC;SACH;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AA7DD,8CA6DC;AAED,KAAK,UAAU,iBAAiB,CAAC,QAAgB,EAAE,OAAgB,EAAE,OAAkD;IACtH,SAAS,QAAQ,CAAC,QAAgB,EAAE,MAAc;QACjD,MAAM,OAAO,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACjE,QAAQ,CAAC,YAAY,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,MAAM,SAAS,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC1G,KAAK,MAAM,KAAK,IAAI,OAAO,IAAI,EAAE,EAAE;YAClC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACtB;IACF,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QACpD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;YACtB,IAAI,OAAO,EAAE;gBACZ,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACrB;YACD,IAAI,UAAU,EAAE;gBACf,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;aACtC;YACD,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9E,IAAI,KAAK,EAAE;oBACV,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;iBACrB;gBACD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBACzB,IAAI,MAAM,EAAE;oBACX,OAAO,MAAM,EAAE,CAAC;iBAChB;gBACD,OAAO,OAAO,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,QAAQ,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAC,OAAgB,EAAE,UAAmB;IAC9E,OAAO,iBAAiB,CAAC,4BAA4B,EAAE,OAAO,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7F,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;QACpC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;KACjF,CAAC,CAAC,CAAC,CAAC;AACN,CAAC;AALD,kDAKC"} \ No newline at end of file diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts index baf65773465..6edfdcb63fb 100644 --- a/build/lib/extensions.ts +++ b/build/lib/extensions.ts @@ -22,10 +22,9 @@ const buffer = require('gulp-buffer'); import * as jsoncParser from 'jsonc-parser'; import webpack = require('webpack'); import { getProductionDependencies } from './dependencies'; -import { getExtensionStream } from './builtInExtensions'; +import { IExtensionDefinition, getExtensionStream } from './builtInExtensions'; import { getVersion } from './getVersion'; -import { remote, IOptions as IRemoteSrcOptions } from './gulpRemoteSource'; -import { assetFromGithub } from './github'; +import { fetchUrls, fetchGithub } from './fetch'; const root = path.dirname(path.dirname(__dirname)); const commit = getVersion(root); @@ -61,12 +60,12 @@ function updateExtensionPackageJSON(input: Stream, update: (data: any) => any): .pipe(packageJsonFilter.restore); } -function fromLocal(extensionPath: string, forWeb: boolean): Stream { +function fromLocal(extensionPath: string, forWeb: boolean, disableMangle: boolean): Stream { const webpackConfigFileName = forWeb ? 'extension-browser.webpack.config.js' : 'extension.webpack.config.js'; const isWebPacked = fs.existsSync(path.join(extensionPath, webpackConfigFileName)); let input = isWebPacked - ? fromLocalWebpack(extensionPath, webpackConfigFileName) + ? fromLocalWebpack(extensionPath, webpackConfigFileName, disableMangle) : fromLocalNormal(extensionPath); if (isWebPacked) { @@ -85,7 +84,7 @@ function fromLocal(extensionPath: string, forWeb: boolean): Stream { } -function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string): Stream { +function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string, disableMangle: boolean): Stream { const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce'); const webpack = require('webpack'); const webpackGulp = require('webpack-stream'); @@ -141,6 +140,19 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string): ...config, ...{ mode: 'production' } }; + if (disableMangle) { + if (Array.isArray(config.module.rules)) { + for (const rule of config.module.rules) { + if (Array.isArray(rule.use)) { + for (const use of rule.use) { + if (String(use.loader).endsWith('mangle-loader.js')) { + use.options.disabled = true; + } + } + } + } + } + } const relativeOutputPath = path.relative(extensionPath, webpackConfig.output.path); return webpackGulp(webpackConfig, webpack, webpackDone) @@ -209,7 +221,7 @@ const baseHeaders = { 'X-Market-User-Id': '291C1CD0-051A-4123-9B4B-30D60EF52EE2', }; -export function fromMarketplace(serviceUrl: string, { name: extensionName, version, metadata }: IBuiltInExtension): Stream { +export function fromMarketplace(serviceUrl: string, { name: extensionName, version, sha256, metadata }: IExtensionDefinition): Stream { const json = require('gulp-json-editor') as typeof import('gulp-json-editor'); const [publisher, name] = extensionName.split('.'); @@ -217,16 +229,15 @@ export function fromMarketplace(serviceUrl: string, { name: extensionName, versi fancyLog('Downloading extension:', ansiColors.yellow(`${extensionName}@${version}`), '...'); - const options: IRemoteSrcOptions = { - base: url, - fetchOptions: { - headers: baseHeaders - } - }; - const packageJsonFilter = filter('package.json', { restore: true }); - return remote('', options) + return fetchUrls('', { + base: url, + nodeFetchOptions: { + headers: baseHeaders + }, + checksumSha256: sha256 + }) .pipe(vzip.src()) .pipe(filter('extension/**')) .pipe(rename(p => p.dirname = p.dirname!.replace(/^extension\/?/, ''))) @@ -237,14 +248,18 @@ export function fromMarketplace(serviceUrl: string, { name: extensionName, versi } -export function fromGithub({ name, version, repo, metadata }: IBuiltInExtension): Stream { +export function fromGithub({ name, version, repo, sha256, metadata }: IExtensionDefinition): Stream { const json = require('gulp-json-editor') as typeof import('gulp-json-editor'); fancyLog('Downloading extension from GH:', ansiColors.yellow(`${name}@${version}`), '...'); const packageJsonFilter = filter('package.json', { restore: true }); - return assetFromGithub(new URL(repo).pathname, version, name => name.endsWith('.vsix')) + return fetchGithub(new URL(repo).pathname, { + version, + name: name => name.endsWith('.vsix'), + checksumSha256: sha256 + }) .pipe(buffer()) .pipe(vzip.src()) .pipe(filter('extension/**')) @@ -271,16 +286,9 @@ const marketplaceWebExtensionsExclude = new Set([ 'ms-vscode.vscode-js-profile-table' ]); -interface IBuiltInExtension { - name: string; - version: string; - repo: string; - metadata: any; -} - const productJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')); -const builtInExtensions: IBuiltInExtension[] = productJson.builtInExtensions || []; -const webBuiltInExtensions: IBuiltInExtension[] = productJson.webBuiltInExtensions || []; +const builtInExtensions: IExtensionDefinition[] = productJson.builtInExtensions || []; +const webBuiltInExtensions: IExtensionDefinition[] = productJson.webBuiltInExtensions || []; type ExtensionKind = 'ui' | 'workspace' | 'web'; interface IExtensionManifest { @@ -318,7 +326,7 @@ function isWebExtension(manifest: IExtensionManifest): boolean { return true; } -export function packageLocalExtensionsStream(forWeb: boolean): Stream { +export function packageLocalExtensionsStream(forWeb: boolean, disableMangle: boolean): Stream { const localExtensionsDescriptions = ( (glob.sync('extensions/*/package.json')) .map(manifestPath => { @@ -334,7 +342,7 @@ export function packageLocalExtensionsStream(forWeb: boolean): Stream { const localExtensionsStream = minifyExtensionResources( es.merge( ...localExtensionsDescriptions.map(extension => { - return fromLocal(extension.path, forWeb) + return fromLocal(extension.path, forWeb, disableMangle) .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`)); }) ) @@ -351,7 +359,8 @@ export function packageLocalExtensionsStream(forWeb: boolean): Stream { result = es.merge( localExtensionsStream, gulp.src(dependenciesSrc, { base: '.' }) - .pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore')))); + .pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore'))) + .pipe(util2.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`)))); } return ( diff --git a/build/lib/fetch.js b/build/lib/fetch.js new file mode 100644 index 00000000000..e9a1362b50c --- /dev/null +++ b/build/lib/fetch.js @@ -0,0 +1,136 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.fetchGithub = exports.fetchUrl = exports.fetchUrls = void 0; +const es = require("event-stream"); +const node_fetch_1 = require("node-fetch"); +const VinylFile = require("vinyl"); +const log = require("fancy-log"); +const ansiColors = require("ansi-colors"); +const crypto = require("crypto"); +const through2 = require("through2"); +function fetchUrls(urls, options) { + if (options === undefined) { + options = {}; + } + if (typeof options.base !== 'string' && options.base !== null) { + options.base = '/'; + } + if (!Array.isArray(urls)) { + urls = [urls]; + } + return es.readArray(urls).pipe(es.map((data, cb) => { + const url = [options.base, data].join(''); + fetchUrl(url, options).then(file => { + cb(undefined, file); + }, error => { + cb(error); + }); + })); +} +exports.fetchUrls = fetchUrls; +async function fetchUrl(url, options, retries = 10, retryDelay = 1000) { + const verbose = !!options.verbose ?? (!!process.env['CI'] || !!process.env['BUILD_ARTIFACTSTAGINGDIRECTORY']); + try { + let startTime = 0; + if (verbose) { + log(`Start fetching ${ansiColors.magenta(url)}${retries !== 10 ? `(${10 - retries} retry}` : ''}`); + startTime = new Date().getTime(); + } + const controller = new AbortController(); + const timeout = setTimeout(() => controller.abort(), 30 * 1000); + try { + const response = await (0, node_fetch_1.default)(url, { + ...options.nodeFetchOptions, + signal: controller.signal /* Typings issue with lib.dom.d.ts */ + }); + if (verbose) { + log(`Fetch completed: Status ${response.status}. Took ${ansiColors.magenta(`${new Date().getTime() - startTime} ms`)}`); + } + if (response.ok && (response.status >= 200 && response.status < 300)) { + const contents = await response.buffer(); + if (options.checksumSha256) { + const actualSHA256Checksum = crypto.createHash('sha256').update(contents).digest('hex'); + if (actualSHA256Checksum !== options.checksumSha256) { + throw new Error(`Checksum mismatch for ${ansiColors.cyan(url)} (expected ${options.checksumSha256}, actual ${actualSHA256Checksum}))`); + } + else if (verbose) { + log(`Verified SHA256 checksums match for ${ansiColors.cyan(url)}`); + } + } + else if (verbose) { + log(`Skipping checksum verification for ${ansiColors.cyan(url)} because no expected checksum was provided`); + } + if (verbose) { + log(`Fetched response body buffer: ${ansiColors.magenta(`${contents.byteLength} bytes`)}`); + } + return new VinylFile({ + cwd: '/', + base: options.base, + path: url, + contents + }); + } + throw new Error(`Request ${ansiColors.magenta(url)} failed with status code: ${response.status}`); + } + finally { + clearTimeout(timeout); + } + } + catch (e) { + if (verbose) { + log(`Fetching ${ansiColors.cyan(url)} failed: ${e}`); + } + if (retries > 0) { + await new Promise(resolve => setTimeout(resolve, retryDelay)); + return fetchUrl(url, options, retries - 1, retryDelay); + } + throw e; + } +} +exports.fetchUrl = fetchUrl; +const ghApiHeaders = { + Accept: 'application/vnd.github.v3+json', + 'User-Agent': 'VSCode Build', +}; +if (process.env.GITHUB_TOKEN) { + ghApiHeaders.Authorization = 'Basic ' + Buffer.from(process.env.GITHUB_TOKEN).toString('base64'); +} +const ghDownloadHeaders = { + ...ghApiHeaders, + Accept: 'application/octet-stream', +}; +/** + * @param repo for example `Microsoft/vscode` + * @param version for example `16.17.1` - must be a valid releases tag + * @param assetName for example (name) => name === `win-x64-node.exe` - must be an asset that exists + * @returns a stream with the asset as file + */ +function fetchGithub(repo, options) { + return fetchUrls(`/repos/${repo.replace(/^\/|\/$/g, '')}/releases/tags/v${options.version}`, { + base: 'https://api.github.com', + verbose: options.verbose, + nodeFetchOptions: { headers: ghApiHeaders } + }).pipe(through2.obj(async function (file, _enc, callback) { + const assetFilter = typeof options.name === 'string' ? (name) => name === options.name : options.name; + const asset = JSON.parse(file.contents.toString()).assets.find((a) => assetFilter(a.name)); + if (!asset) { + return callback(new Error(`Could not find asset in release of ${repo} @ ${options.version}`)); + } + try { + callback(null, await fetchUrl(asset.url, { + nodeFetchOptions: { headers: ghDownloadHeaders }, + verbose: options.verbose, + checksumSha256: options.checksumSha256 + })); + } + catch (error) { + callback(error); + } + })); +} +exports.fetchGithub = fetchGithub; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmV0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmZXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxtQ0FBbUM7QUFDbkMsMkNBQWdEO0FBQ2hELG1DQUFtQztBQUNuQyxpQ0FBaUM7QUFDakMsMENBQTBDO0FBQzFDLGlDQUFpQztBQUNqQyxxQ0FBcUM7QUFVckMsU0FBZ0IsU0FBUyxDQUFDLElBQXVCLEVBQUUsT0FBc0I7SUFDeEUsSUFBSSxPQUFPLEtBQUssU0FBUyxFQUFFO1FBQzFCLE9BQU8sR0FBRyxFQUFFLENBQUM7S0FDYjtJQUVELElBQUksT0FBTyxPQUFPLENBQUMsSUFBSSxLQUFLLFFBQVEsSUFBSSxPQUFPLENBQUMsSUFBSSxLQUFLLElBQUksRUFBRTtRQUM5RCxPQUFPLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQztLQUNuQjtJQUVELElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFO1FBQ3pCLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0tBQ2Q7SUFFRCxPQUFPLEVBQUUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQTJCLENBQUMsSUFBWSxFQUFFLEVBQUUsRUFBRSxFQUFFO1FBQ3BGLE1BQU0sR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDMUMsUUFBUSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDbEMsRUFBRSxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNyQixDQUFDLEVBQUUsS0FBSyxDQUFDLEVBQUU7WUFDVixFQUFFLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDWCxDQUFDLENBQUMsQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBckJELDhCQXFCQztBQUVNLEtBQUssVUFBVSxRQUFRLENBQUMsR0FBVyxFQUFFLE9BQXNCLEVBQUUsT0FBTyxHQUFHLEVBQUUsRUFBRSxVQUFVLEdBQUcsSUFBSTtJQUNsRyxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sSUFBSSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGdDQUFnQyxDQUFDLENBQUMsQ0FBQztJQUM5RyxJQUFJO1FBQ0gsSUFBSSxTQUFTLEdBQUcsQ0FBQyxDQUFDO1FBQ2xCLElBQUksT0FBTyxFQUFFO1lBQ1osR0FBRyxDQUFDLGtCQUFrQixVQUFVLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLE9BQU8sS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxHQUFHLE9BQU8sU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ25HLFNBQVMsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDO1NBQ2pDO1FBQ0QsTUFBTSxVQUFVLEdBQUcsSUFBSSxlQUFlLEVBQUUsQ0FBQztRQUN6QyxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUNoRSxJQUFJO1lBQ0gsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFBLG9CQUFLLEVBQUMsR0FBRyxFQUFFO2dCQUNqQyxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0I7Z0JBQzNCLE1BQU0sRUFBRSxVQUFVLENBQUMsTUFBYSxDQUFDLHFDQUFxQzthQUN0RSxDQUFDLENBQUM7WUFDSCxJQUFJLE9BQU8sRUFBRTtnQkFDWixHQUFHLENBQUMsMkJBQTJCLFFBQVEsQ0FBQyxNQUFNLFVBQVUsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUMsT0FBTyxFQUFFLEdBQUcsU0FBUyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7YUFDeEg7WUFDRCxJQUFJLFFBQVEsQ0FBQyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxJQUFJLEdBQUcsSUFBSSxRQUFRLENBQUMsTUFBTSxHQUFHLEdBQUcsQ0FBQyxFQUFFO2dCQUNyRSxNQUFNLFFBQVEsR0FBRyxNQUFNLFFBQVEsQ0FBQyxNQUFNLEVBQUUsQ0FBQztnQkFDekMsSUFBSSxPQUFPLENBQUMsY0FBYyxFQUFFO29CQUMzQixNQUFNLG9CQUFvQixHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztvQkFDeEYsSUFBSSxvQkFBb0IsS0FBSyxPQUFPLENBQUMsY0FBYyxFQUFFO3dCQUNwRCxNQUFNLElBQUksS0FBSyxDQUFDLHlCQUF5QixVQUFVLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxjQUFjLE9BQU8sQ0FBQyxjQUFjLFlBQVksb0JBQW9CLElBQUksQ0FBQyxDQUFDO3FCQUN2STt5QkFBTSxJQUFJLE9BQU8sRUFBRTt3QkFDbkIsR0FBRyxDQUFDLHVDQUF1QyxVQUFVLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztxQkFDbkU7aUJBQ0Q7cUJBQU0sSUFBSSxPQUFPLEVBQUU7b0JBQ25CLEdBQUcsQ0FBQyxzQ0FBc0MsVUFBVSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsNENBQTRDLENBQUMsQ0FBQztpQkFDNUc7Z0JBQ0QsSUFBSSxPQUFPLEVBQUU7b0JBQ1osR0FBRyxDQUFDLGlDQUFpQyxVQUFVLENBQUMsT0FBTyxDQUFDLEdBQUksUUFBbUIsQ0FBQyxVQUFVLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQztpQkFDdkc7Z0JBQ0QsT0FBTyxJQUFJLFNBQVMsQ0FBQztvQkFDcEIsR0FBRyxFQUFFLEdBQUc7b0JBQ1IsSUFBSSxFQUFFLE9BQU8sQ0FBQyxJQUFJO29CQUNsQixJQUFJLEVBQUUsR0FBRztvQkFDVCxRQUFRO2lCQUNSLENBQUMsQ0FBQzthQUNIO1lBQ0QsTUFBTSxJQUFJLEtBQUssQ0FBQyxXQUFXLFVBQVUsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLDZCQUE2QixRQUFRLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztTQUNsRztnQkFBUztZQUNULFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztTQUN0QjtLQUNEO0lBQUMsT0FBTyxDQUFDLEVBQUU7UUFDWCxJQUFJLE9BQU8sRUFBRTtZQUNaLEdBQUcsQ0FBQyxZQUFZLFVBQVUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUMsQ0FBQztTQUNyRDtRQUNELElBQUksT0FBTyxHQUFHLENBQUMsRUFBRTtZQUNoQixNQUFNLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQzlELE9BQU8sUUFBUSxDQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUUsT0FBTyxHQUFHLENBQUMsRUFBRSxVQUFVLENBQUMsQ0FBQztTQUN2RDtRQUNELE1BQU0sQ0FBQyxDQUFDO0tBQ1I7QUFDRixDQUFDO0FBdERELDRCQXNEQztBQUVELE1BQU0sWUFBWSxHQUEyQjtJQUM1QyxNQUFNLEVBQUUsZ0NBQWdDO0lBQ3hDLFlBQVksRUFBRSxjQUFjO0NBQzVCLENBQUM7QUFDRixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsWUFBWSxFQUFFO0lBQzdCLFlBQVksQ0FBQyxhQUFhLEdBQUcsUUFBUSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7Q0FDakc7QUFDRCxNQUFNLGlCQUFpQixHQUFHO0lBQ3pCLEdBQUcsWUFBWTtJQUNmLE1BQU0sRUFBRSwwQkFBMEI7Q0FDbEMsQ0FBQztBQVNGOzs7OztHQUtHO0FBQ0gsU0FBZ0IsV0FBVyxDQUFDLElBQVksRUFBRSxPQUE0QjtJQUNyRSxPQUFPLFNBQVMsQ0FBQyxVQUFVLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQyxtQkFBbUIsT0FBTyxDQUFDLE9BQU8sRUFBRSxFQUFFO1FBQzVGLElBQUksRUFBRSx3QkFBd0I7UUFDOUIsT0FBTyxFQUFFLE9BQU8sQ0FBQyxPQUFPO1FBQ3hCLGdCQUFnQixFQUFFLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRTtLQUMzQyxDQUFDLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsS0FBSyxXQUFXLElBQUksRUFBRSxJQUFJLEVBQUUsUUFBUTtRQUN4RCxNQUFNLFdBQVcsR0FBRyxPQUFPLE9BQU8sQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7UUFDOUcsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQW1CLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUM3RyxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ1gsT0FBTyxRQUFRLENBQUMsSUFBSSxLQUFLLENBQUMsc0NBQXNDLElBQUksTUFBTSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDO1NBQzlGO1FBQ0QsSUFBSTtZQUNILFFBQVEsQ0FBQyxJQUFJLEVBQUUsTUFBTSxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRTtnQkFDeEMsZ0JBQWdCLEVBQUUsRUFBRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUU7Z0JBQ2hELE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTztnQkFDeEIsY0FBYyxFQUFFLE9BQU8sQ0FBQyxjQUFjO2FBQ3RDLENBQUMsQ0FBQyxDQUFDO1NBQ0o7UUFBQyxPQUFPLEtBQUssRUFBRTtZQUNmLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztTQUNoQjtJQUNGLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBckJELGtDQXFCQyJ9 \ No newline at end of file diff --git a/build/lib/fetch.ts b/build/lib/fetch.ts new file mode 100644 index 00000000000..238f0ac4228 --- /dev/null +++ b/build/lib/fetch.ts @@ -0,0 +1,147 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as es from 'event-stream'; +import fetch, { RequestInit } from 'node-fetch'; +import * as VinylFile from 'vinyl'; +import * as log from 'fancy-log'; +import * as ansiColors from 'ansi-colors'; +import * as crypto from 'crypto'; +import * as through2 from 'through2'; +import { Stream } from 'stream'; + +export interface IFetchOptions { + base?: string; + nodeFetchOptions?: RequestInit; + verbose?: boolean; + checksumSha256?: string; +} + +export function fetchUrls(urls: string[] | string, options: IFetchOptions): es.ThroughStream { + if (options === undefined) { + options = {}; + } + + if (typeof options.base !== 'string' && options.base !== null) { + options.base = '/'; + } + + if (!Array.isArray(urls)) { + urls = [urls]; + } + + return es.readArray(urls).pipe(es.map((data: string, cb) => { + const url = [options.base, data].join(''); + fetchUrl(url, options).then(file => { + cb(undefined, file); + }, error => { + cb(error); + }); + })); +} + +export async function fetchUrl(url: string, options: IFetchOptions, retries = 10, retryDelay = 1000): Promise { + const verbose = !!options.verbose ?? (!!process.env['CI'] || !!process.env['BUILD_ARTIFACTSTAGINGDIRECTORY']); + try { + let startTime = 0; + if (verbose) { + log(`Start fetching ${ansiColors.magenta(url)}${retries !== 10 ? `(${10 - retries} retry}` : ''}`); + startTime = new Date().getTime(); + } + const controller = new AbortController(); + const timeout = setTimeout(() => controller.abort(), 30 * 1000); + try { + const response = await fetch(url, { + ...options.nodeFetchOptions, + signal: controller.signal as any /* Typings issue with lib.dom.d.ts */ + }); + if (verbose) { + log(`Fetch completed: Status ${response.status}. Took ${ansiColors.magenta(`${new Date().getTime() - startTime} ms`)}`); + } + if (response.ok && (response.status >= 200 && response.status < 300)) { + const contents = await response.buffer(); + if (options.checksumSha256) { + const actualSHA256Checksum = crypto.createHash('sha256').update(contents).digest('hex'); + if (actualSHA256Checksum !== options.checksumSha256) { + throw new Error(`Checksum mismatch for ${ansiColors.cyan(url)} (expected ${options.checksumSha256}, actual ${actualSHA256Checksum}))`); + } else if (verbose) { + log(`Verified SHA256 checksums match for ${ansiColors.cyan(url)}`); + } + } else if (verbose) { + log(`Skipping checksum verification for ${ansiColors.cyan(url)} because no expected checksum was provided`); + } + if (verbose) { + log(`Fetched response body buffer: ${ansiColors.magenta(`${(contents as Buffer).byteLength} bytes`)}`); + } + return new VinylFile({ + cwd: '/', + base: options.base, + path: url, + contents + }); + } + throw new Error(`Request ${ansiColors.magenta(url)} failed with status code: ${response.status}`); + } finally { + clearTimeout(timeout); + } + } catch (e) { + if (verbose) { + log(`Fetching ${ansiColors.cyan(url)} failed: ${e}`); + } + if (retries > 0) { + await new Promise(resolve => setTimeout(resolve, retryDelay)); + return fetchUrl(url, options, retries - 1, retryDelay); + } + throw e; + } +} + +const ghApiHeaders: Record = { + Accept: 'application/vnd.github.v3+json', + 'User-Agent': 'VSCode Build', +}; +if (process.env.GITHUB_TOKEN) { + ghApiHeaders.Authorization = 'Basic ' + Buffer.from(process.env.GITHUB_TOKEN).toString('base64'); +} +const ghDownloadHeaders = { + ...ghApiHeaders, + Accept: 'application/octet-stream', +}; + +export interface IGitHubAssetOptions { + version: string; + name: string | ((name: string) => boolean); + checksumSha256?: string; + verbose?: boolean; +} + +/** + * @param repo for example `Microsoft/vscode` + * @param version for example `16.17.1` - must be a valid releases tag + * @param assetName for example (name) => name === `win-x64-node.exe` - must be an asset that exists + * @returns a stream with the asset as file + */ +export function fetchGithub(repo: string, options: IGitHubAssetOptions): Stream { + return fetchUrls(`/repos/${repo.replace(/^\/|\/$/g, '')}/releases/tags/v${options.version}`, { + base: 'https://api.github.com', + verbose: options.verbose, + nodeFetchOptions: { headers: ghApiHeaders } + }).pipe(through2.obj(async function (file, _enc, callback) { + const assetFilter = typeof options.name === 'string' ? (name: string) => name === options.name : options.name; + const asset = JSON.parse(file.contents.toString()).assets.find((a: { name: string }) => assetFilter(a.name)); + if (!asset) { + return callback(new Error(`Could not find asset in release of ${repo} @ ${options.version}`)); + } + try { + callback(null, await fetchUrl(asset.url, { + nodeFetchOptions: { headers: ghDownloadHeaders }, + verbose: options.verbose, + checksumSha256: options.checksumSha256 + })); + } catch (error) { + callback(error); + } + })); +} diff --git a/build/lib/github.js b/build/lib/github.js deleted file mode 100644 index 01b2cd2e3d1..00000000000 --- a/build/lib/github.js +++ /dev/null @@ -1,48 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.assetFromGithub = void 0; -const node_fetch_1 = require("node-fetch"); -const gulpRemoteSource_1 = require("./gulpRemoteSource"); -const through2 = require("through2"); -const ghApiHeaders = { - Accept: 'application/vnd.github.v3+json', - 'User-Agent': 'VSCode Build', -}; -if (process.env.GITHUB_TOKEN) { - ghApiHeaders.Authorization = 'Basic ' + Buffer.from(process.env.GITHUB_TOKEN).toString('base64'); -} -const ghDownloadHeaders = { - ...ghApiHeaders, - Accept: 'application/octet-stream', -}; -/** - * @param repo for example `Microsoft/vscode` - * @param version for example `16.17.1` - must be a valid releases tag - * @param assetName for example (name) => name === `win-x64-node.exe` - must be an asset that exists - * @returns a stream with the asset as file - */ -function assetFromGithub(repo, version, assetFilter) { - return (0, gulpRemoteSource_1.remote)(`/repos/${repo.replace(/^\/|\/$/g, '')}/releases/tags/v${version}`, { - base: 'https://api.github.com', - fetchOptions: { headers: ghApiHeaders } - }).pipe(through2.obj(async function (file, _enc, callback) { - const asset = JSON.parse(file.contents.toString()).assets.find((a) => assetFilter(a.name)); - if (!asset) { - return callback(new Error(`Could not find asset in release of ${repo} @ ${version}`)); - } - const response = await (0, node_fetch_1.default)(asset.url, { headers: ghDownloadHeaders }); - if (response.ok) { - file.contents = response.body.pipe(through2()); - callback(null, file); - } - else { - return callback(new Error(`Request ${response.url} failed with status code: ${response.status}`)); - } - })); -} -exports.assetFromGithub = assetFromGithub; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0aHViLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZ2l0aHViLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBR2hHLDJDQUErQjtBQUMvQix5REFBNEM7QUFDNUMscUNBQXFDO0FBRXJDLE1BQU0sWUFBWSxHQUEyQjtJQUM1QyxNQUFNLEVBQUUsZ0NBQWdDO0lBQ3hDLFlBQVksRUFBRSxjQUFjO0NBQzVCLENBQUM7QUFDRixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsWUFBWSxFQUFFO0lBQzdCLFlBQVksQ0FBQyxhQUFhLEdBQUcsUUFBUSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7Q0FDakc7QUFDRCxNQUFNLGlCQUFpQixHQUFHO0lBQ3pCLEdBQUcsWUFBWTtJQUNmLE1BQU0sRUFBRSwwQkFBMEI7Q0FDbEMsQ0FBQztBQUVGOzs7OztHQUtHO0FBQ0gsU0FBZ0IsZUFBZSxDQUFDLElBQVksRUFBRSxPQUFlLEVBQUUsV0FBc0M7SUFDcEcsT0FBTyxJQUFBLHlCQUFNLEVBQUMsVUFBVSxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxFQUFFLENBQUMsbUJBQW1CLE9BQU8sRUFBRSxFQUFFO1FBQ2pGLElBQUksRUFBRSx3QkFBd0I7UUFDOUIsWUFBWSxFQUFFLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRTtLQUN2QyxDQUFDLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsS0FBSyxXQUFXLElBQUksRUFBRSxJQUFJLEVBQUUsUUFBUTtRQUN4RCxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBbUIsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBQzdHLElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDWCxPQUFPLFFBQVEsQ0FBQyxJQUFJLEtBQUssQ0FBQyxzQ0FBc0MsSUFBSSxNQUFNLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQztTQUN0RjtRQUNELE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBQSxvQkFBSyxFQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQyxDQUFDO1FBQ3hFLElBQUksUUFBUSxDQUFDLEVBQUUsRUFBRTtZQUNoQixJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7WUFDL0MsUUFBUSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztTQUNyQjthQUFNO1lBQ04sT0FBTyxRQUFRLENBQUMsSUFBSSxLQUFLLENBQUMsV0FBVyxRQUFRLENBQUMsR0FBRyw2QkFBNkIsUUFBUSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQztTQUNsRztJQUVGLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBbEJELDBDQWtCQyJ9 \ No newline at end of file diff --git a/build/lib/github.ts b/build/lib/github.ts deleted file mode 100644 index c9a457e49ab..00000000000 --- a/build/lib/github.ts +++ /dev/null @@ -1,47 +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 { Stream } from 'stream'; -import fetch from 'node-fetch'; -import { remote } from './gulpRemoteSource'; -import * as through2 from 'through2'; - -const ghApiHeaders: Record = { - Accept: 'application/vnd.github.v3+json', - 'User-Agent': 'VSCode Build', -}; -if (process.env.GITHUB_TOKEN) { - ghApiHeaders.Authorization = 'Basic ' + Buffer.from(process.env.GITHUB_TOKEN).toString('base64'); -} -const ghDownloadHeaders = { - ...ghApiHeaders, - Accept: 'application/octet-stream', -}; - -/** - * @param repo for example `Microsoft/vscode` - * @param version for example `16.17.1` - must be a valid releases tag - * @param assetName for example (name) => name === `win-x64-node.exe` - must be an asset that exists - * @returns a stream with the asset as file - */ -export function assetFromGithub(repo: string, version: string, assetFilter: (name: string) => boolean): Stream { - return remote(`/repos/${repo.replace(/^\/|\/$/g, '')}/releases/tags/v${version}`, { - base: 'https://api.github.com', - fetchOptions: { headers: ghApiHeaders } - }).pipe(through2.obj(async function (file, _enc, callback) { - const asset = JSON.parse(file.contents.toString()).assets.find((a: { name: string }) => assetFilter(a.name)); - if (!asset) { - return callback(new Error(`Could not find asset in release of ${repo} @ ${version}`)); - } - const response = await fetch(asset.url, { headers: ghDownloadHeaders }); - if (response.ok) { - file.contents = response.body.pipe(through2()); - callback(null, file); - } else { - return callback(new Error(`Request ${response.url} failed with status code: ${response.status}`)); - } - - })); -} diff --git a/build/lib/gulpRemoteSource.js b/build/lib/gulpRemoteSource.js deleted file mode 100644 index e0707bb18c0..00000000000 --- a/build/lib/gulpRemoteSource.js +++ /dev/null @@ -1,58 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.remote = void 0; -const es = require("event-stream"); -const node_fetch_1 = require("node-fetch"); -const VinylFile = require("vinyl"); -const through2 = require("through2"); -function remote(urls, options) { - if (options === undefined) { - options = {}; - } - if (typeof options.base !== 'string' && options.base !== null) { - options.base = '/'; - } - if (typeof options.buffer !== 'boolean') { - options.buffer = true; - } - if (!Array.isArray(urls)) { - urls = [urls]; - } - return es.readArray(urls).pipe(es.map((data, cb) => { - const url = [options.base, data].join(''); - fetchWithRetry(url, options).then(file => { - cb(undefined, file); - }, error => { - cb(error); - }); - })); -} -exports.remote = remote; -async function fetchWithRetry(url, options, retries = 3, retryDelay = 1000) { - try { - const response = await (0, node_fetch_1.default)(url, options.fetchOptions); - if (response.ok && (response.status >= 200 && response.status < 300)) { - // request must be piped out once created, or we'll get this error: "You cannot pipe after data has been emitted from the response." - const contents = options.buffer ? await response.buffer() : response.body.pipe(through2()); - return new VinylFile({ - cwd: '/', - base: options.base, - path: url, - contents - }); - } - throw new Error(`Request ${url} failed with status code: ${response.status}`); - } - catch (e) { - if (retries > 0) { - await new Promise(c => setTimeout(c, retryDelay)); - return fetchWithRetry(url, options, retries - 1, retryDelay * 3); - } - throw e; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3VscFJlbW90ZVNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImd1bHBSZW1vdGVTb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOzs7QUFFaEcsbUNBQW1DO0FBQ25DLDJDQUFnRDtBQUNoRCxtQ0FBbUM7QUFDbkMscUNBQXFDO0FBUXJDLFNBQWdCLE1BQU0sQ0FBQyxJQUF1QixFQUFFLE9BQWlCO0lBQ2hFLElBQUksT0FBTyxLQUFLLFNBQVMsRUFBRTtRQUMxQixPQUFPLEdBQUcsRUFBRSxDQUFDO0tBQ2I7SUFFRCxJQUFJLE9BQU8sT0FBTyxDQUFDLElBQUksS0FBSyxRQUFRLElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxJQUFJLEVBQUU7UUFDOUQsT0FBTyxDQUFDLElBQUksR0FBRyxHQUFHLENBQUM7S0FDbkI7SUFFRCxJQUFJLE9BQU8sT0FBTyxDQUFDLE1BQU0sS0FBSyxTQUFTLEVBQUU7UUFDeEMsT0FBTyxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUM7S0FDdEI7SUFFRCxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtRQUN6QixJQUFJLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztLQUNkO0lBRUQsT0FBTyxFQUFFLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUEyQixDQUFDLElBQVksRUFBRSxFQUFFLEVBQUUsRUFBRTtRQUNwRixNQUFNLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQzFDLGNBQWMsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ3hDLEVBQUUsQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDckIsQ0FBQyxFQUFFLEtBQUssQ0FBQyxFQUFFO1lBQ1YsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7SUFDSixDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQXpCRCx3QkF5QkM7QUFFRCxLQUFLLFVBQVUsY0FBYyxDQUFDLEdBQVcsRUFBRSxPQUFpQixFQUFFLE9BQU8sR0FBRyxDQUFDLEVBQUUsVUFBVSxHQUFHLElBQUk7SUFDM0YsSUFBSTtRQUNILE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBQSxvQkFBSyxFQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDeEQsSUFBSSxRQUFRLENBQUMsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sSUFBSSxHQUFHLElBQUksUUFBUSxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUMsRUFBRTtZQUNyRSxvSUFBb0k7WUFDcEksTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsTUFBTSxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7WUFDM0YsT0FBTyxJQUFJLFNBQVMsQ0FBQztnQkFDcEIsR0FBRyxFQUFFLEdBQUc7Z0JBQ1IsSUFBSSxFQUFFLE9BQU8sQ0FBQyxJQUFJO2dCQUNsQixJQUFJLEVBQUUsR0FBRztnQkFDVCxRQUFRO2FBQ1IsQ0FBQyxDQUFDO1NBQ0g7UUFDRCxNQUFNLElBQUksS0FBSyxDQUFDLFdBQVcsR0FBRyw2QkFBNkIsUUFBUSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7S0FDOUU7SUFBQyxPQUFPLENBQUMsRUFBRTtRQUNYLElBQUksT0FBTyxHQUFHLENBQUMsRUFBRTtZQUNoQixNQUFNLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLENBQUMsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQ2xELE9BQU8sY0FBYyxDQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUUsT0FBTyxHQUFHLENBQUMsRUFBRSxVQUFVLEdBQUcsQ0FBQyxDQUFDLENBQUM7U0FDakU7UUFDRCxNQUFNLENBQUMsQ0FBQztLQUNSO0FBQ0YsQ0FBQyJ9 \ No newline at end of file diff --git a/build/lib/gulpRemoteSource.ts b/build/lib/gulpRemoteSource.ts deleted file mode 100644 index 77060913ab1..00000000000 --- a/build/lib/gulpRemoteSource.ts +++ /dev/null @@ -1,69 +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 * as es from 'event-stream'; -import fetch, { RequestInit } from 'node-fetch'; -import * as VinylFile from 'vinyl'; -import * as through2 from 'through2'; - -export interface IOptions { - base?: string; - buffer?: boolean; - fetchOptions?: RequestInit; -} - -export function remote(urls: string[] | string, options: IOptions): es.ThroughStream { - if (options === undefined) { - options = {}; - } - - if (typeof options.base !== 'string' && options.base !== null) { - options.base = '/'; - } - - if (typeof options.buffer !== 'boolean') { - options.buffer = true; - } - - if (!Array.isArray(urls)) { - urls = [urls]; - } - - return es.readArray(urls).pipe(es.map((data: string, cb) => { - const url = [options.base, data].join(''); - fetchWithRetry(url, options).then(file => { - cb(undefined, file); - }, error => { - cb(error); - }); - })); -} - -async function fetchWithRetry(url: string, options: IOptions, retries = 3, retryDelay = 1000): Promise { - try { - const response = await fetch(url, options.fetchOptions); - if (response.ok && (response.status >= 200 && response.status < 300)) { - // request must be piped out once created, or we'll get this error: "You cannot pipe after data has been emitted from the response." - const contents = options.buffer ? await response.buffer() : response.body.pipe(through2()); - return new VinylFile({ - cwd: '/', - base: options.base, - path: url, - contents - }); - } - throw new Error(`Request ${url} failed with status code: ${response.status}`); - } catch (e) { - if (retries > 0) { - await new Promise(c => setTimeout(c, retryDelay)); - return fetchWithRetry(url, options, retries - 1, retryDelay * 3); - } - throw e; - } -} - - - - diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json index 024fa8f6b68..f83225cc974 100644 --- a/build/lib/i18n.resources.json +++ b/build/lib/i18n.resources.json @@ -75,7 +75,7 @@ "project": "vscode-workbench" }, { - "name": "vs/workbench/contrib/experiments", + "name": "vs/workbench/services/assignment", "project": "vscode-workbench" }, { @@ -86,10 +86,6 @@ "name": "vs/workbench/contrib/externalTerminal", "project": "vscode-workbench" }, - { - "name": "vs/workbench/contrib/feedback", - "project": "vscode-workbench" - }, { "name": "vs/workbench/contrib/files", "project": "vscode-workbench" @@ -159,7 +155,7 @@ "project": "vscode-workbench" }, { - "name": "vs/workbench/contrib/interactiveEditor", + "name": "vs/workbench/contrib/inlineChat", "project": "vscode-workbench" }, { @@ -290,6 +286,10 @@ "name": "vs/workbench/contrib/welcomeWalkthrough", "project": "vscode-workbench" }, + { + "name": "vs/workbench/contrib/welcomeDialog", + "project": "vscode-workbench" + }, { "name": "vs/workbench/contrib/outline", "project": "vscode-workbench" @@ -322,10 +322,6 @@ "name": "vs/workbench/contrib/bracketPairColorizer2Telemetry", "project": "vscode-workbench" }, - { - "name": "vs/workbench/contrib/offline", - "project": "vscode-workbench" - }, { "name": "vs/workbench/contrib/remoteTunnel", "project": "vscode-workbench" @@ -382,6 +378,10 @@ "name": "vs/workbench/services/files", "project": "vscode-workbench" }, + { + "name": "vs/workbench/services/filesConfiguration", + "project": "vscode-workbench" + }, { "name": "vs/workbench/services/history", "project": "vscode-workbench" @@ -514,9 +514,21 @@ "name": "vs/workbench/services/localization", "project": "vscode-workbench" }, + { + "name": "vs/workbench/contrib/share", + "project": "vscode-workbench" + }, { "name": "vs/workbench/contrib/accessibility", "project": "vscode-workbench" + }, + { + "name": "vs/workbench/services/issue", + "project": "vscode-workbench" + }, + { + "name": "vs/workbench/services/secrets", + "project": "vscode-workbench" } ] } diff --git a/build/lib/mangle/index.js b/build/lib/mangle/index.js new file mode 100644 index 00000000000..75981c79d06 --- /dev/null +++ b/build/lib/mangle/index.js @@ -0,0 +1,665 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.Mangler = void 0; +const fs = require("fs"); +const path = require("path"); +const process_1 = require("process"); +const source_map_1 = require("source-map"); +const ts = require("typescript"); +const url_1 = require("url"); +const workerpool = require("workerpool"); +const staticLanguageServiceHost_1 = require("./staticLanguageServiceHost"); +const buildfile = require('../../../src/buildfile'); +class ShortIdent { + prefix; + static _keywords = new Set(['await', 'break', 'case', 'catch', 'class', 'const', 'continue', 'debugger', + 'default', 'delete', 'do', 'else', 'export', 'extends', 'false', 'finally', 'for', 'function', 'if', + 'import', 'in', 'instanceof', 'let', 'new', 'null', 'return', 'static', 'super', 'switch', 'this', 'throw', + 'true', 'try', 'typeof', 'var', 'void', 'while', 'with', 'yield']); + static _alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890$_'.split(''); + _value = 0; + constructor(prefix) { + this.prefix = prefix; + } + next(isNameTaken) { + const candidate = this.prefix + ShortIdent.convert(this._value); + this._value++; + if (ShortIdent._keywords.has(candidate) || /^[_0-9]/.test(candidate) || isNameTaken?.(candidate)) { + // try again + return this.next(isNameTaken); + } + return candidate; + } + static convert(n) { + const base = this._alphabet.length; + let result = ''; + do { + const rest = n % base; + result += this._alphabet[rest]; + n = (n / base) | 0; + } while (n > 0); + return result; + } +} +var FieldType; +(function (FieldType) { + FieldType[FieldType["Public"] = 0] = "Public"; + FieldType[FieldType["Protected"] = 1] = "Protected"; + FieldType[FieldType["Private"] = 2] = "Private"; +})(FieldType || (FieldType = {})); +class ClassData { + fileName; + node; + fields = new Map(); + replacements; + parent; + children; + constructor(fileName, node) { + // analyse all fields (properties and methods). Find usages of all protected and + // private ones and keep track of all public ones (to prevent naming collisions) + this.fileName = fileName; + this.node = node; + const candidates = []; + for (const member of node.members) { + if (ts.isMethodDeclaration(member)) { + // method `foo() {}` + candidates.push(member); + } + else if (ts.isPropertyDeclaration(member)) { + // property `foo = 234` + candidates.push(member); + } + else if (ts.isGetAccessor(member)) { + // getter: `get foo() { ... }` + candidates.push(member); + } + else if (ts.isSetAccessor(member)) { + // setter: `set foo() { ... }` + candidates.push(member); + } + else if (ts.isConstructorDeclaration(member)) { + // constructor-prop:`constructor(private foo) {}` + for (const param of member.parameters) { + if (hasModifier(param, ts.SyntaxKind.PrivateKeyword) + || hasModifier(param, ts.SyntaxKind.ProtectedKeyword) + || hasModifier(param, ts.SyntaxKind.PublicKeyword) + || hasModifier(param, ts.SyntaxKind.ReadonlyKeyword)) { + candidates.push(param); + } + } + } + } + for (const member of candidates) { + const ident = ClassData._getMemberName(member); + if (!ident) { + continue; + } + const type = ClassData._getFieldType(member); + this.fields.set(ident, { type, pos: member.name.getStart() }); + } + } + static _getMemberName(node) { + if (!node.name) { + return undefined; + } + const { name } = node; + let ident = name.getText(); + if (name.kind === ts.SyntaxKind.ComputedPropertyName) { + if (name.expression.kind !== ts.SyntaxKind.StringLiteral) { + // unsupported: [Symbol.foo] or [abc + 'field'] + return; + } + // ['foo'] + ident = name.expression.getText().slice(1, -1); + } + return ident; + } + static _getFieldType(node) { + if (hasModifier(node, ts.SyntaxKind.PrivateKeyword)) { + return 2 /* FieldType.Private */; + } + else if (hasModifier(node, ts.SyntaxKind.ProtectedKeyword)) { + return 1 /* FieldType.Protected */; + } + else { + return 0 /* FieldType.Public */; + } + } + static _shouldMangle(type) { + return type === 2 /* FieldType.Private */ + || type === 1 /* FieldType.Protected */; + } + static makeImplicitPublicActuallyPublic(data, reportViolation) { + // TS-HACK + // A subtype can make an inherited protected field public. To prevent accidential + // mangling of public fields we mark the original (protected) fields as public... + for (const [name, info] of data.fields) { + if (info.type !== 0 /* FieldType.Public */) { + continue; + } + let parent = data.parent; + while (parent) { + if (parent.fields.get(name)?.type === 1 /* FieldType.Protected */) { + const parentPos = parent.node.getSourceFile().getLineAndCharacterOfPosition(parent.fields.get(name).pos); + const infoPos = data.node.getSourceFile().getLineAndCharacterOfPosition(info.pos); + reportViolation(name, `'${name}' from ${parent.fileName}:${parentPos.line + 1}`, `${data.fileName}:${infoPos.line + 1}`); + parent.fields.get(name).type = 0 /* FieldType.Public */; + } + parent = parent.parent; + } + } + } + static fillInReplacement(data) { + if (data.replacements) { + // already done + return; + } + // fill in parents first + if (data.parent) { + ClassData.fillInReplacement(data.parent); + } + data.replacements = new Map(); + const isNameTaken = (name) => { + // locally taken + if (data._isNameTaken(name)) { + return true; + } + // parents + let parent = data.parent; + while (parent) { + if (parent._isNameTaken(name)) { + return true; + } + parent = parent.parent; + } + // children + if (data.children) { + const stack = [...data.children]; + while (stack.length) { + const node = stack.pop(); + if (node._isNameTaken(name)) { + return true; + } + if (node.children) { + stack.push(...node.children); + } + } + } + return false; + }; + const identPool = new ShortIdent(''); + for (const [name, info] of data.fields) { + if (ClassData._shouldMangle(info.type)) { + const shortName = identPool.next(isNameTaken); + data.replacements.set(name, shortName); + } + } + } + // a name is taken when a field that doesn't get mangled exists or + // when the name is already in use for replacement + _isNameTaken(name) { + if (this.fields.has(name) && !ClassData._shouldMangle(this.fields.get(name).type)) { + // public field + return true; + } + if (this.replacements) { + for (const shortName of this.replacements.values()) { + if (shortName === name) { + // replaced already (happens wih super types) + return true; + } + } + } + if (isNameTakenInFile(this.node, name)) { + return true; + } + return false; + } + lookupShortName(name) { + let value = this.replacements.get(name); + let parent = this.parent; + while (parent) { + if (parent.replacements.has(name) && parent.fields.get(name)?.type === 1 /* FieldType.Protected */) { + value = parent.replacements.get(name) ?? value; + } + parent = parent.parent; + } + return value; + } + // --- parent chaining + addChild(child) { + this.children ??= []; + this.children.push(child); + child.parent = this; + } +} +function isNameTakenInFile(node, name) { + const identifiers = node.getSourceFile().identifiers; + if (identifiers instanceof Map) { + if (identifiers.has(name)) { + return true; + } + } + return false; +} +const fileIdents = new class { + idents = new ShortIdent('$'); + next() { + return this.idents.next(); + } +}; +const skippedExportMangledFiles = [ + // Build + 'css.build', + 'nls.build', + // Monaco + 'editorCommon', + 'editorOptions', + 'editorZoom', + 'standaloneEditor', + 'standaloneEnums', + 'standaloneLanguages', + // Generated + 'extensionsApiProposals', + // Module passed around as type + 'pfs', + // entry points + ...[ + buildfile.entrypoint('vs/server/node/server.main', []), + buildfile.entrypoint('vs/workbench/workbench.desktop.main', []), + buildfile.base, + buildfile.workerExtensionHost, + buildfile.workerNotebook, + buildfile.workerLanguageDetection, + buildfile.workerLocalFileSearch, + buildfile.workerProfileAnalysis, + buildfile.workbenchDesktop, + buildfile.workbenchWeb, + buildfile.code + ].flat().map(x => x.name), +]; +const skippedExportMangledProjects = [ + // Test projects + 'vscode-api-tests', + // These projects use webpack to dynamically rewrite imports, which messes up our mangling + 'configuration-editing', + 'microsoft-authentication', + 'github-authentication', + 'html-language-features/server', +]; +const skippedExportMangledSymbols = [ + // Don't mangle extension entry points + 'activate', + 'deactivate', +]; +class DeclarationData { + fileName; + node; + service; + replacementName; + constructor(fileName, node, service) { + this.fileName = fileName; + this.node = node; + this.service = service; + // Todo: generate replacement names based on usage count, with more used names getting shorter identifiers + this.replacementName = fileIdents.next(); + } + get locations() { + if (ts.isVariableDeclaration(this.node)) { + // If the const aliases any types, we need to rename those too + const definitionResult = this.service.getDefinitionAndBoundSpan(this.fileName, this.node.name.getStart()); + if (definitionResult?.definitions && definitionResult.definitions.length > 1) { + return definitionResult.definitions.map(x => ({ fileName: x.fileName, offset: x.textSpan.start })); + } + } + return [{ + fileName: this.fileName, + offset: this.node.name.getStart() + }]; + } + shouldMangle(newName) { + const currentName = this.node.name.getText(); + if (currentName.startsWith('$') || skippedExportMangledSymbols.includes(currentName)) { + return false; + } + // New name is longer the existing one :'( + if (newName.length >= currentName.length) { + return false; + } + // Don't mangle functions we've explicitly opted out + if (this.node.getFullText().includes('@skipMangle')) { + return false; + } + return true; + } +} +/** + * TypeScript2TypeScript transformer that mangles all private and protected fields + * + * 1. Collect all class fields (properties, methods) + * 2. Collect all sub and super-type relations between classes + * 3. Compute replacement names for each field + * 4. Lookup rename locations for these fields + * 5. Prepare and apply edits + */ +class Mangler { + projectPath; + log; + config; + allClassDataByKey = new Map(); + allExportedSymbols = new Set(); + service; + renameWorkerPool; + constructor(projectPath, log = () => { }, config) { + this.projectPath = projectPath; + this.log = log; + this.config = config; + this.service = ts.createLanguageService(new staticLanguageServiceHost_1.StaticLanguageServiceHost(projectPath)); + this.renameWorkerPool = workerpool.pool(path.join(__dirname, 'renameWorker.js'), { + maxWorkers: 1, + minWorkers: 'max' + }); + } + async computeNewFileContents(strictImplicitPublicHandling) { + // STEP: + // - Find all classes and their field info. + // - Find exported symbols. + const visit = (node) => { + if (this.config.manglePrivateFields) { + if (ts.isClassDeclaration(node) || ts.isClassExpression(node)) { + const anchor = node.name ?? node; + const key = `${node.getSourceFile().fileName}|${anchor.getStart()}`; + if (this.allClassDataByKey.has(key)) { + throw new Error('DUPE?'); + } + this.allClassDataByKey.set(key, new ClassData(node.getSourceFile().fileName, node)); + } + } + if (this.config.mangleExports) { + // Find exported classes, functions, and vars + if (( + // Exported class + ts.isClassDeclaration(node) + && hasModifier(node, ts.SyntaxKind.ExportKeyword) + && node.name) || ( + // Exported function + ts.isFunctionDeclaration(node) + && ts.isSourceFile(node.parent) + && hasModifier(node, ts.SyntaxKind.ExportKeyword) + && node.name && node.body // On named function and not on the overload + ) || ( + // Exported variable + ts.isVariableDeclaration(node) + && hasModifier(node.parent.parent, ts.SyntaxKind.ExportKeyword) // Variable statement is exported + && ts.isSourceFile(node.parent.parent.parent)) + // Disabled for now because we need to figure out how to handle + // enums that are used in monaco or extHost interfaces. + /* || ( + // Exported enum + ts.isEnumDeclaration(node) + && ts.isSourceFile(node.parent) + && hasModifier(node, ts.SyntaxKind.ExportKeyword) + && !hasModifier(node, ts.SyntaxKind.ConstKeyword) // Don't bother mangling const enums because these are inlined + && node.name + */ + ) { + if (isInAmbientContext(node)) { + return; + } + this.allExportedSymbols.add(new DeclarationData(node.getSourceFile().fileName, node, this.service)); + } + } + ts.forEachChild(node, visit); + }; + for (const file of this.service.getProgram().getSourceFiles()) { + if (!file.isDeclarationFile) { + ts.forEachChild(file, visit); + } + } + this.log(`Done collecting. Classes: ${this.allClassDataByKey.size}. Exported symbols: ${this.allExportedSymbols.size}`); + // STEP: connect sub and super-types + const setupParents = (data) => { + const extendsClause = data.node.heritageClauses?.find(h => h.token === ts.SyntaxKind.ExtendsKeyword); + if (!extendsClause) { + // no EXTENDS-clause + return; + } + const info = this.service.getDefinitionAtPosition(data.fileName, extendsClause.types[0].expression.getEnd()); + if (!info || info.length === 0) { + // throw new Error('SUPER type not found'); + return; + } + if (info.length !== 1) { + // inherits from declared/library type + return; + } + const [definition] = info; + const key = `${definition.fileName}|${definition.textSpan.start}`; + const parent = this.allClassDataByKey.get(key); + if (!parent) { + // throw new Error(`SUPER type not found: ${key}`); + return; + } + parent.addChild(data); + }; + for (const data of this.allClassDataByKey.values()) { + setupParents(data); + } + // STEP: make implicit public (actually protected) field really public + const violations = new Map(); + let violationsCauseFailure = false; + for (const data of this.allClassDataByKey.values()) { + ClassData.makeImplicitPublicActuallyPublic(data, (name, what, why) => { + const arr = violations.get(what); + if (arr) { + arr.push(why); + } + else { + violations.set(what, [why]); + } + if (strictImplicitPublicHandling && !strictImplicitPublicHandling.has(name)) { + violationsCauseFailure = true; + } + }); + } + for (const [why, whys] of violations) { + this.log(`WARN: ${why} became PUBLIC because of: ${whys.join(' , ')}`); + } + if (violationsCauseFailure) { + const message = 'Protected fields have been made PUBLIC. This hurts minification and is therefore not allowed. Review the WARN messages further above'; + this.log(`ERROR: ${message}`); + throw new Error(message); + } + // STEP: compute replacement names for each class + for (const data of this.allClassDataByKey.values()) { + ClassData.fillInReplacement(data); + } + this.log(`Done creating class replacements`); + // STEP: prepare rename edits + this.log(`Starting prepare rename edits`); + const editsByFile = new Map(); + const appendEdit = (fileName, edit) => { + const edits = editsByFile.get(fileName); + if (!edits) { + editsByFile.set(fileName, [edit]); + } + else { + edits.push(edit); + } + }; + const appendRename = (newText, loc) => { + appendEdit(loc.fileName, { + newText: (loc.prefixText || '') + newText + (loc.suffixText || ''), + offset: loc.textSpan.start, + length: loc.textSpan.length + }); + }; + const renameResults = []; + const queueRename = (fileName, pos, newName) => { + renameResults.push(Promise.resolve(this.renameWorkerPool.exec('findRenameLocations', [this.projectPath, fileName, pos])) + .then((locations) => ({ newName, locations }))); + }; + for (const data of this.allClassDataByKey.values()) { + if (hasModifier(data.node, ts.SyntaxKind.DeclareKeyword)) { + continue; + } + fields: for (const [name, info] of data.fields) { + if (!ClassData._shouldMangle(info.type)) { + continue fields; + } + // TS-HACK: protected became public via 'some' child + // and because of that we might need to ignore this now + let parent = data.parent; + while (parent) { + if (parent.fields.get(name)?.type === 0 /* FieldType.Public */) { + continue fields; + } + parent = parent.parent; + } + const newName = data.lookupShortName(name); + queueRename(data.fileName, info.pos, newName); + } + } + for (const data of this.allExportedSymbols.values()) { + if (data.fileName.endsWith('.d.ts') + || skippedExportMangledProjects.some(proj => data.fileName.includes(proj)) + || skippedExportMangledFiles.some(file => data.fileName.endsWith(file + '.ts'))) { + continue; + } + if (!data.shouldMangle(data.replacementName)) { + continue; + } + const newText = data.replacementName; + for (const { fileName, offset } of data.locations) { + queueRename(fileName, offset, newText); + } + } + await Promise.all(renameResults).then((result) => { + for (const { newName, locations } of result) { + for (const loc of locations) { + appendRename(newName, loc); + } + } + }); + await this.renameWorkerPool.terminate(); + this.log(`Done preparing edits: ${editsByFile.size} files`); + // STEP: apply all rename edits (per file) + const result = new Map(); + let savedBytes = 0; + for (const item of this.service.getProgram().getSourceFiles()) { + const { mapRoot, sourceRoot } = this.service.getProgram().getCompilerOptions(); + const projectDir = path.dirname(this.projectPath); + const sourceMapRoot = mapRoot ?? (0, url_1.pathToFileURL)(sourceRoot ?? projectDir).toString(); + // source maps + let generator; + let newFullText; + const edits = editsByFile.get(item.fileName); + if (!edits) { + // just copy + newFullText = item.getFullText(); + } + else { + // source map generator + const relativeFileName = normalize(path.relative(projectDir, item.fileName)); + const mappingsByLine = new Map(); + // apply renames + edits.sort((a, b) => b.offset - a.offset); + const characters = item.getFullText().split(''); + let lastEdit; + for (const edit of edits) { + if (lastEdit && lastEdit.offset === edit.offset) { + // + if (lastEdit.length !== edit.length || lastEdit.newText !== edit.newText) { + this.log('ERROR: Overlapping edit', item.fileName, edit.offset, edits); + throw new Error('OVERLAPPING edit'); + } + else { + continue; + } + } + lastEdit = edit; + const mangledName = characters.splice(edit.offset, edit.length, edit.newText).join(''); + savedBytes += mangledName.length - edit.newText.length; + // source maps + const pos = item.getLineAndCharacterOfPosition(edit.offset); + let mappings = mappingsByLine.get(pos.line); + if (!mappings) { + mappings = []; + mappingsByLine.set(pos.line, mappings); + } + mappings.unshift({ + source: relativeFileName, + original: { line: pos.line + 1, column: pos.character }, + generated: { line: pos.line + 1, column: pos.character }, + name: mangledName + }, { + source: relativeFileName, + original: { line: pos.line + 1, column: pos.character + edit.length }, + generated: { line: pos.line + 1, column: pos.character + edit.newText.length }, + }); + } + // source map generation, make sure to get mappings per line correct + generator = new source_map_1.SourceMapGenerator({ file: path.basename(item.fileName), sourceRoot: sourceMapRoot }); + generator.setSourceContent(relativeFileName, item.getFullText()); + for (const [, mappings] of mappingsByLine) { + let lineDelta = 0; + for (const mapping of mappings) { + generator.addMapping({ + ...mapping, + generated: { line: mapping.generated.line, column: mapping.generated.column - lineDelta } + }); + lineDelta += mapping.original.column - mapping.generated.column; + } + } + newFullText = characters.join(''); + } + result.set(item.fileName, { out: newFullText, sourceMap: generator?.toString() }); + } + this.log(`Done: ${savedBytes / 1000}kb saved`); + return result; + } +} +exports.Mangler = Mangler; +// --- ast utils +function hasModifier(node, kind) { + const modifiers = ts.canHaveModifiers(node) ? ts.getModifiers(node) : undefined; + return Boolean(modifiers?.find(mode => mode.kind === kind)); +} +function isInAmbientContext(node) { + for (let p = node.parent; p; p = p.parent) { + if (ts.isModuleDeclaration(p)) { + return true; + } + } + return false; +} +function normalize(path) { + return path.replace(/\\/g, '/'); +} +async function _run() { + const root = path.join(__dirname, '..', '..', '..'); + const projectBase = path.join(root, 'src'); + const projectPath = path.join(projectBase, 'tsconfig.json'); + const newProjectBase = path.join(path.dirname(projectBase), path.basename(projectBase) + '2'); + fs.cpSync(projectBase, newProjectBase, { recursive: true }); + const mangler = new Mangler(projectPath, console.log, { + mangleExports: true, + manglePrivateFields: true, + }); + for (const [fileName, contents] of await mangler.computeNewFileContents(new Set(['saveState']))) { + const newFilePath = path.join(newProjectBase, path.relative(projectBase, fileName)); + await fs.promises.mkdir(path.dirname(newFilePath), { recursive: true }); + await fs.promises.writeFile(newFilePath, contents.out); + if (contents.sourceMap) { + await fs.promises.writeFile(newFilePath + '.map', contents.sourceMap); + } + } +} +if (__filename === process_1.argv[1]) { + _run(); +} +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,yBAAyB;AACzB,6BAA6B;AAC7B,qCAA+B;AAC/B,2CAAyD;AACzD,iCAAiC;AACjC,6BAAoC;AACpC,yCAAyC;AACzC,2EAAwE;AACxE,MAAM,SAAS,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAEpD,MAAM,UAAU;IAYG;IAVV,MAAM,CAAC,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU;QAC9G,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI;QACnG,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO;QAC1G,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5D,MAAM,CAAC,SAAS,GAAG,kEAAkE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEhG,MAAM,GAAG,CAAC,CAAC;IAEnB,YACkB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAC5B,CAAC;IAEL,IAAI,CAAC,WAAuC;QAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,WAAW,EAAE,CAAC,SAAS,CAAC,EAAE;YACjG,YAAY;YACZ,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC9B;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAEO,MAAM,CAAC,OAAO,CAAC,CAAS;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QACnC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,GAAG;YACF,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC;YACtB,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB,QAAQ,CAAC,GAAG,CAAC,EAAE;QAChB,OAAO,MAAM,CAAC;IACf,CAAC;;AAGF,IAAW,SAIV;AAJD,WAAW,SAAS;IACnB,6CAAM,CAAA;IACN,mDAAS,CAAA;IACT,+CAAO,CAAA;AACR,CAAC,EAJU,SAAS,KAAT,SAAS,QAInB;AAED,MAAM,SAAS;IAUJ;IACA;IATV,MAAM,GAAG,IAAI,GAAG,EAA4C,CAAC;IAErD,YAAY,CAAkC;IAEtD,MAAM,CAAwB;IAC9B,QAAQ,CAA0B;IAElC,YACU,QAAgB,EAChB,IAA8C;QAEvD,gFAAgF;QAChF,gFAAgF;QAJvE,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAA0C;QAKvD,MAAM,UAAU,GAA4B,EAAE,CAAC;QAC/C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YAClC,IAAI,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE;gBACnC,oBAAoB;gBACpB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;gBAC5C,uBAAuB;gBACvB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;gBACpC,8BAA8B;gBAC9B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;gBACpC,8BAA8B;gBAC9B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE;gBAC/C,iDAAiD;gBACjD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,EAAE;oBACtC,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;2BAChD,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC;2BAClD,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;2BAC/C,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EACnD;wBACD,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBACvB;iBACD;aACD;SACD;QACD,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAChC,MAAM,KAAK,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC,KAAK,EAAE;gBACX,SAAS;aACT;YACD,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,IAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC/D;IACF,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,IAAyB;QACtD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACf,OAAO,SAAS,CAAC;SACjB;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACtB,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE;YACrD,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE;gBACzD,+CAA+C;gBAC/C,OAAO;aACP;YACD,UAAU;YACV,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC/C;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,MAAM,CAAC,aAAa,CAAC,IAAa;QACzC,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YACpD,iCAAyB;SACzB;aAAM,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;YAC7D,mCAA2B;SAC3B;aAAM;YACN,gCAAwB;SACxB;IACF,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,IAAe;QACnC,OAAO,IAAI,8BAAsB;eAC7B,IAAI,gCAAwB,CAC9B;IACH,CAAC;IAED,MAAM,CAAC,gCAAgC,CAAC,IAAe,EAAE,eAAkE;QAC1H,UAAU;QACV,iFAAiF;QACjF,iFAAiF;QACjF,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YACvC,IAAI,IAAI,CAAC,IAAI,6BAAqB,EAAE;gBACnC,SAAS;aACT;YACD,IAAI,MAAM,GAA0B,IAAI,CAAC,MAAM,CAAC;YAChD,OAAO,MAAM,EAAE;gBACd,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,gCAAwB,EAAE;oBAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,6BAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,GAAG,CAAC,CAAC;oBAC1G,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAClF,eAAe,CAAC,IAAI,EAAE,IAAI,IAAI,UAAU,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC;oBAEzH,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,2BAAmB,CAAC;iBACjD;gBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACvB;SACD;IACF,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,IAAe;QAEvC,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,eAAe;YACf,OAAO;SACP;QAED,wBAAwB;QACxB,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACzC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QAE9B,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE;YACpC,gBAAgB;YAChB,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;gBAC5B,OAAO,IAAI,CAAC;aACZ;YAED,UAAU;YACV,IAAI,MAAM,GAA0B,IAAI,CAAC,MAAM,CAAC;YAChD,OAAO,MAAM,EAAE;gBACd,IAAI,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;oBAC9B,OAAO,IAAI,CAAC;iBACZ;gBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACvB;YAED,WAAW;YACX,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAClB,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACjC,OAAO,KAAK,CAAC,MAAM,EAAE;oBACpB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;oBAC1B,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;wBAC5B,OAAO,IAAI,CAAC;qBACZ;oBACD,IAAI,IAAI,CAAC,QAAQ,EAAE;wBAClB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;qBAC7B;iBACD;aACD;YAED,OAAO,KAAK,CAAC;QACd,CAAC,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;QAErC,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YACvC,IAAI,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACvC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC9C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;aACvC;SACD;IACF,CAAC;IAED,kEAAkE;IAClE,kDAAkD;IAC1C,YAAY,CAAC,IAAY;QAChC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,CAAC,EAAE;YACnF,eAAe;YACf,OAAO,IAAI,CAAC;SACZ;QACD,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE;gBACnD,IAAI,SAAS,KAAK,IAAI,EAAE;oBACvB,6CAA6C;oBAC7C,OAAO,IAAI,CAAC;iBACZ;aACD;SACD;QAED,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YACvC,OAAO,IAAI,CAAC;SACZ;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAED,eAAe,CAAC,IAAY;QAC3B,IAAI,KAAK,GAAG,IAAI,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QAC1C,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,OAAO,MAAM,EAAE;YACd,IAAI,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,gCAAwB,EAAE;gBAC5F,KAAK,GAAG,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAE,IAAI,KAAK,CAAC;aACjD;YACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;SACvB;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,sBAAsB;IAEtB,QAAQ,CAAC,KAAgB;QACxB,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACD;AAED,SAAS,iBAAiB,CAAC,IAAa,EAAE,IAAY;IACrD,MAAM,WAAW,GAAS,IAAI,CAAC,aAAa,EAAG,CAAC,WAAW,CAAC;IAC5D,IAAI,WAAW,YAAY,GAAG,EAAE;QAC/B,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC;SACZ;KACD;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,GAAG,IAAI;IACL,MAAM,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IAE9C,IAAI;QACH,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACD,CAAC;AAEF,MAAM,yBAAyB,GAAG;IACjC,QAAQ;IACR,WAAW;IACX,WAAW;IAEX,SAAS;IACT,cAAc;IACd,eAAe;IACf,YAAY;IACZ,kBAAkB;IAClB,iBAAiB;IACjB,qBAAqB;IAErB,YAAY;IACZ,wBAAwB;IAExB,+BAA+B;IAC/B,KAAK;IAEL,eAAe;IACf,GAAG;QACF,SAAS,CAAC,UAAU,CAAC,4BAA4B,EAAE,EAAE,CAAC;QACtD,SAAS,CAAC,UAAU,CAAC,qCAAqC,EAAE,EAAE,CAAC;QAC/D,SAAS,CAAC,IAAI;QACd,SAAS,CAAC,mBAAmB;QAC7B,SAAS,CAAC,cAAc;QACxB,SAAS,CAAC,uBAAuB;QACjC,SAAS,CAAC,qBAAqB;QAC/B,SAAS,CAAC,qBAAqB;QAC/B,SAAS,CAAC,gBAAgB;QAC1B,SAAS,CAAC,YAAY;QACtB,SAAS,CAAC,IAAI;KACd,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;CACzB,CAAC;AAEF,MAAM,4BAA4B,GAAG;IACpC,gBAAgB;IAChB,kBAAkB;IAElB,0FAA0F;IAC1F,uBAAuB;IACvB,0BAA0B;IAC1B,uBAAuB;IACvB,+BAA+B;CAC/B,CAAC;AAEF,MAAM,2BAA2B,GAAG;IACnC,sCAAsC;IACtC,UAAU;IACV,YAAY;CACZ,CAAC;AAEF,MAAM,eAAe;IAKV;IACA;IACQ;IALT,eAAe,CAAS;IAEjC,YACU,QAAgB,EAChB,IAAgG,EACxF,OAA2B;QAFnC,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAA4F;QACxF,YAAO,GAAP,OAAO,CAAoB;QAE5C,0GAA0G;QAC1G,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;IAC1C,CAAC;IAED,IAAI,SAAS;QACZ,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACxC,8DAA8D;YAC9D,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1G,IAAI,gBAAgB,EAAE,WAAW,IAAI,gBAAgB,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7E,OAAO,gBAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;aACnG;SACD;QAED,OAAO,CAAC;gBACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,QAAQ,EAAE;aAClC,CAAC,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,OAAe;QAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,OAAO,EAAE,CAAC;QAC9C,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,2BAA2B,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YACrF,OAAO,KAAK,CAAC;SACb;QAED,0CAA0C;QAC1C,IAAI,OAAO,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM,EAAE;YACzC,OAAO,KAAK,CAAC;SACb;QAED,oDAAoD;QACpD,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YACpD,OAAO,KAAK,CAAC;SACb;QAED,OAAO,IAAI,CAAC;IACb,CAAC;CACD;AAOD;;;;;;;;GAQG;AACH,MAAa,OAAO;IASD;IACA;IACA;IATD,iBAAiB,GAAG,IAAI,GAAG,EAAqB,CAAC;IACjD,kBAAkB,GAAG,IAAI,GAAG,EAAmB,CAAC;IAEhD,OAAO,CAAqB;IAC5B,gBAAgB,CAAwB;IAEzD,YACkB,WAAmB,EACnB,MAA0B,GAAG,EAAE,GAAG,CAAC,EACnC,MAAkF;QAFlF,gBAAW,GAAX,WAAW,CAAQ;QACnB,QAAG,GAAH,GAAG,CAAgC;QACnC,WAAM,GAAN,MAAM,CAA4E;QAEnG,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,qBAAqB,CAAC,IAAI,qDAAyB,CAAC,WAAW,CAAC,CAAC,CAAC;QAEpF,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE;YAChF,UAAU,EAAE,CAAC;YACb,UAAU,EAAE,KAAK;SACjB,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,4BAA0C;QAEtE,QAAQ;QACR,2CAA2C;QAC3C,2BAA2B;QAE3B,MAAM,KAAK,GAAG,CAAC,IAAa,EAAQ,EAAE;YACrC,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE;gBACpC,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;oBAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;oBACjC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;oBACpE,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;wBACpC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;qBACzB;oBACD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;iBACpF;aACD;YAED,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;gBAC9B,6CAA6C;gBAC7C,IACC;gBACC,iBAAiB;gBACjB,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC;uBACxB,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;uBAC9C,IAAI,CAAC,IAAI,CACZ,IAAI;gBACJ,oBAAoB;gBACpB,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC;uBAC3B,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;uBAC5B,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;uBAC9C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,4CAA4C;iBACtE,IAAI;gBACJ,oBAAoB;gBACpB,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC;uBAC3B,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,iCAAiC;uBAC9F,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAC7C;gBAED,+DAA+D;gBAC/D,uDAAuD;gBACvD;;;;;;;kBAOE;kBACD;oBACD,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE;wBAC7B,OAAO;qBACP;oBAED,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;iBACpG;aACD;YAED,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,cAAc,EAAE,EAAE;YAC/D,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAC5B,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aAC7B;SACD;QACD,IAAI,CAAC,GAAG,CAAC,6BAA6B,IAAI,CAAC,iBAAiB,CAAC,IAAI,uBAAuB,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC;QAGxH,qCAAqC;QAErC,MAAM,YAAY,GAAG,CAAC,IAAe,EAAE,EAAE;YACxC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YACrG,IAAI,CAAC,aAAa,EAAE;gBACnB,oBAAoB;gBACpB,OAAO;aACP;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7G,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/B,2CAA2C;gBAC3C,OAAO;aACP;YAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,sCAAsC;gBACtC,OAAO;aACP;YAED,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;YAC1B,MAAM,GAAG,GAAG,GAAG,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAClE,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,EAAE;gBACZ,mDAAmD;gBACnD,OAAO;aACP;YACD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,YAAY,CAAC,IAAI,CAAC,CAAC;SACnB;QAED,uEAAuE;QACvE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;QAC/C,IAAI,sBAAsB,GAAG,KAAK,CAAC;QACnC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,SAAS,CAAC,gCAAgC,CAAC,IAAI,EAAE,CAAC,IAAY,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;gBAC5E,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,GAAG,EAAE;oBACR,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACd;qBAAM;oBACN,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC5B;gBAED,IAAI,4BAA4B,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC5E,sBAAsB,GAAG,IAAI,CAAC;iBAC9B;YACF,CAAC,CAAC,CAAC;SACH;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,UAAU,EAAE;YACrC,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,8BAA8B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SACvE;QACD,IAAI,sBAAsB,EAAE;YAC3B,MAAM,OAAO,GAAG,sIAAsI,CAAC;YACvJ,IAAI,CAAC,GAAG,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;SACzB;QAED,iDAAiD;QACjD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAClC;QACD,IAAI,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;QAE7C,6BAA6B;QAC7B,IAAI,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAG1C,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;QAE9C,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,IAAU,EAAE,EAAE;YACnD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,EAAE;gBACX,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;aAClC;iBAAM;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACjB;QACF,CAAC,CAAC;QACF,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,GAAsB,EAAE,EAAE;YAChE,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE;gBACxB,OAAO,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,GAAG,OAAO,GAAG,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;gBAClE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK;gBAC1B,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM;aAC3B,CAAC,CAAC;QACJ,CAAC,CAAC;QAIF,MAAM,aAAa,GAAmG,EAAE,CAAC;QAEzH,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,GAAW,EAAE,OAAe,EAAE,EAAE;YACtE,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAW,qBAAqB,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;iBAChI,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;gBACzD,SAAS;aACT;YAED,MAAM,EAAE,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC/C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACxC,SAAS,MAAM,CAAC;iBAChB;gBAED,oDAAoD;gBACpD,uDAAuD;gBACvD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBACzB,OAAO,MAAM,EAAE;oBACd,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,6BAAqB,EAAE;wBACvD,SAAS,MAAM,CAAC;qBAChB;oBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;iBACvB;gBAED,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC3C,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aAC9C;SACD;QAED,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE;YACpD,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;mBAC/B,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;mBACvE,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,EAC9E;gBACD,SAAS;aACT;YAED,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;gBAC7C,SAAS;aACT;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC;YACrC,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;aACvC;SACD;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YAChD,KAAK,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,MAAM,EAAE;gBAC5C,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;oBAC5B,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAC3B;aACD;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAExC,IAAI,CAAC,GAAG,CAAC,yBAAyB,WAAW,CAAC,IAAI,QAAQ,CAAC,CAAC;QAE5D,0CAA0C;QAC1C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC/C,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,cAAc,EAAE,EAAE;YAE/D,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,kBAAkB,EAAE,CAAC;YAChF,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,aAAa,GAAG,OAAO,IAAI,IAAA,mBAAa,EAAC,UAAU,IAAI,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEpF,cAAc;YACd,IAAI,SAAyC,CAAC;YAE9C,IAAI,WAAmB,CAAC;YACxB,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,CAAC,KAAK,EAAE;gBACX,YAAY;gBACZ,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;aAEjC;iBAAM;gBACN,uBAAuB;gBACvB,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC7E,MAAM,cAAc,GAAG,IAAI,GAAG,EAAqB,CAAC;gBAEpD,gBAAgB;gBAChB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAEhD,IAAI,QAA0B,CAAC;gBAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;oBACzB,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE;wBAChD,EAAE;wBACF,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAAE;4BACzE,IAAI,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;4BACvE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;yBACpC;6BAAM;4BACN,SAAS;yBACT;qBACD;oBACD,QAAQ,GAAG,IAAI,CAAC;oBAChB,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACvF,UAAU,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;oBAEvD,cAAc;oBACd,MAAM,GAAG,GAAG,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAG5D,IAAI,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC5C,IAAI,CAAC,QAAQ,EAAE;wBACd,QAAQ,GAAG,EAAE,CAAC;wBACd,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;qBACvC;oBACD,QAAQ,CAAC,OAAO,CAAC;wBAChB,MAAM,EAAE,gBAAgB;wBACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;wBACvD,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;wBACxD,IAAI,EAAE,WAAW;qBACjB,EAAE;wBACF,MAAM,EAAE,gBAAgB;wBACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE;wBACrE,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;qBAC9E,CAAC,CAAC;iBACH;gBAED,oEAAoE;gBACpE,SAAS,GAAG,IAAI,+BAAkB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;gBACtG,SAAS,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBACjE,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,cAAc,EAAE;oBAC1C,IAAI,SAAS,GAAG,CAAC,CAAC;oBAClB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;wBAC/B,SAAS,CAAC,UAAU,CAAC;4BACpB,GAAG,OAAO;4BACV,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,SAAS,EAAE;yBACzF,CAAC,CAAC;wBACH,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;qBAChE;iBACD;gBAED,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;SAClF;QAED,IAAI,CAAC,GAAG,CAAC,SAAS,UAAU,GAAG,IAAI,UAAU,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC;IACf,CAAC;CACD;AAxUD,0BAwUC;AAED,gBAAgB;AAEhB,SAAS,WAAW,CAAC,IAAa,EAAE,IAAmB;IACtD,MAAM,SAAS,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,OAAO,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAa;IACxC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE;QAC1C,IAAI,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE;YAC9B,OAAO,IAAI,CAAC;SACZ;KACD;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,KAAK,UAAU,IAAI;IAClB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAC5D,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC;IAE9F,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5D,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,EAAE;QACrD,aAAa,EAAE,IAAI;QACnB,mBAAmB,EAAE,IAAI;KACzB,CAAC,CAAC;IACH,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,MAAM,OAAO,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;QAChG,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QACpF,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxE,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,QAAQ,CAAC,SAAS,EAAE;YACvB,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,GAAG,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;SACtE;KACD;AACF,CAAC;AAED,IAAI,UAAU,KAAK,cAAI,CAAC,CAAC,CAAC,EAAE;IAC3B,IAAI,EAAE,CAAC;CACP"} \ No newline at end of file diff --git a/build/lib/mangleTypeScript.ts b/build/lib/mangle/index.ts similarity index 63% rename from build/lib/mangleTypeScript.ts rename to build/lib/mangle/index.ts index f2707dd3238..a87fe97f456 100644 --- a/build/lib/mangleTypeScript.ts +++ b/build/lib/mangle/index.ts @@ -3,12 +3,15 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as ts from 'typescript'; -import * as path from 'path'; import * as fs from 'fs'; +import * as path from 'path'; import { argv } from 'process'; import { Mapping, SourceMapGenerator } from 'source-map'; +import * as ts from 'typescript'; import { pathToFileURL } from 'url'; +import * as workerpool from 'workerpool'; +import { StaticLanguageServiceHost } from './staticLanguageServiceHost'; +const buildfile = require('../../../src/buildfile'); class ShortIdent { @@ -17,21 +20,20 @@ class ShortIdent { 'import', 'in', 'instanceof', 'let', 'new', 'null', 'return', 'static', 'super', 'switch', 'this', 'throw', 'true', 'try', 'typeof', 'var', 'void', 'while', 'with', 'yield']); - private static _alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''); + private static _alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890$_'.split(''); private _value = 0; - private readonly _isNameTaken: (name: string) => boolean; - constructor(isNameTaken: (name: string) => boolean) { - this._isNameTaken = name => ShortIdent._keywords.has(name) || isNameTaken(name); - } + constructor( + private readonly prefix: string + ) { } - next(): string { - const candidate = ShortIdent.convert(this._value); + next(isNameTaken?: (name: string) => boolean): string { + const candidate = this.prefix + ShortIdent.convert(this._value); this._value++; - if (this._isNameTaken(candidate)) { + if (ShortIdent._keywords.has(candidate) || /^[_0-9]/.test(candidate) || isNameTaken?.(candidate)) { // try again - return this.next(); + return this.next(isNameTaken); } return candidate; } @@ -181,8 +183,7 @@ class ClassData { data.replacements = new Map(); - const identPool = new ShortIdent(name => { - + const isNameTaken = (name: string) => { // locally taken if (data._isNameTaken(name)) { return true; @@ -212,11 +213,12 @@ class ClassData { } return false; - }); + }; + const identPool = new ShortIdent(''); for (const [name, info] of data.fields) { if (ClassData._shouldMangle(info.type)) { - const shortName = identPool.next(); + const shortName = identPool.next(isNameTaken); data.replacements.set(name, shortName); } } @@ -237,12 +239,11 @@ class ClassData { } } } - if ((this.node.getSourceFile()).identifiers instanceof Map) { - // taken by any other usage - if ((this.node.getSourceFile()).identifiers.has(name)) { - return true; - } + + if (isNameTakenInFile(this.node, name)) { + return true; } + return false; } @@ -267,59 +268,122 @@ class ClassData { } } -class StaticLanguageServiceHost implements ts.LanguageServiceHost { - - private readonly _cmdLine: ts.ParsedCommandLine; - private readonly _scriptSnapshots: Map = new Map(); - - constructor(readonly projectPath: string) { - const existingOptions: Partial = {}; - const parsed = ts.readConfigFile(projectPath, ts.sys.readFile); - if (parsed.error) { - throw parsed.error; - } - this._cmdLine = ts.parseJsonConfigFileContent(parsed.config, ts.sys, path.dirname(projectPath), existingOptions); - if (this._cmdLine.errors.length > 0) { - throw parsed.error; +function isNameTakenInFile(node: ts.Node, name: string): boolean { + const identifiers = (node.getSourceFile()).identifiers; + if (identifiers instanceof Map) { + if (identifiers.has(name)) { + return true; } } - getCompilationSettings(): ts.CompilerOptions { - return this._cmdLine.options; + return false; +} + +const fileIdents = new class { + private readonly idents = new ShortIdent('$'); + + next() { + return this.idents.next(); } - getScriptFileNames(): string[] { - return this._cmdLine.fileNames; +}; + +const skippedExportMangledFiles = [ + // Build + 'css.build', + 'nls.build', + + // Monaco + 'editorCommon', + 'editorOptions', + 'editorZoom', + 'standaloneEditor', + 'standaloneEnums', + 'standaloneLanguages', + + // Generated + 'extensionsApiProposals', + + // Module passed around as type + 'pfs', + + // entry points + ...[ + buildfile.entrypoint('vs/server/node/server.main', []), + buildfile.entrypoint('vs/workbench/workbench.desktop.main', []), + buildfile.base, + buildfile.workerExtensionHost, + buildfile.workerNotebook, + buildfile.workerLanguageDetection, + buildfile.workerLocalFileSearch, + buildfile.workerProfileAnalysis, + buildfile.workbenchDesktop, + buildfile.workbenchWeb, + buildfile.code + ].flat().map(x => x.name), +]; + +const skippedExportMangledProjects = [ + // Test projects + 'vscode-api-tests', + + // These projects use webpack to dynamically rewrite imports, which messes up our mangling + 'configuration-editing', + 'microsoft-authentication', + 'github-authentication', + 'html-language-features/server', +]; + +const skippedExportMangledSymbols = [ + // Don't mangle extension entry points + 'activate', + 'deactivate', +]; + +class DeclarationData { + + readonly replacementName: string; + + constructor( + readonly fileName: string, + readonly node: ts.FunctionDeclaration | ts.ClassDeclaration | ts.EnumDeclaration | ts.VariableDeclaration, + private readonly service: ts.LanguageService, + ) { + // Todo: generate replacement names based on usage count, with more used names getting shorter identifiers + this.replacementName = fileIdents.next(); } - getScriptVersion(_fileName: string): string { - return '1'; - } - getProjectVersion(): string { - return '1'; - } - getScriptSnapshot(fileName: string): ts.IScriptSnapshot | undefined { - let result: ts.IScriptSnapshot | undefined = this._scriptSnapshots.get(fileName); - if (result === undefined) { - const content = ts.sys.readFile(fileName); - if (content === undefined) { - return undefined; + + get locations(): Iterable<{ fileName: string; offset: number }> { + if (ts.isVariableDeclaration(this.node)) { + // If the const aliases any types, we need to rename those too + const definitionResult = this.service.getDefinitionAndBoundSpan(this.fileName, this.node.name.getStart()); + if (definitionResult?.definitions && definitionResult.definitions.length > 1) { + return definitionResult.definitions.map(x => ({ fileName: x.fileName, offset: x.textSpan.start })); } - result = ts.ScriptSnapshot.fromString(content); - this._scriptSnapshots.set(fileName, result); } - return result; + + return [{ + fileName: this.fileName, + offset: this.node.name!.getStart() + }]; } - getCurrentDirectory(): string { - return path.dirname(this.projectPath); + + shouldMangle(newName: string): boolean { + const currentName = this.node.name!.getText(); + if (currentName.startsWith('$') || skippedExportMangledSymbols.includes(currentName)) { + return false; + } + + // New name is longer the existing one :'( + if (newName.length >= currentName.length) { + return false; + } + + // Don't mangle functions we've explicitly opted out + if (this.node.getFullText().includes('@skipMangle')) { + return false; + } + + return true; } - getDefaultLibFileName(options: ts.CompilerOptions): string { - return ts.getDefaultLibFilePath(options); - } - directoryExists = ts.sys.directoryExists; - getDirectories = ts.sys.getDirectories; - fileExists = ts.sys.fileExists; - readFile = ts.sys.readFile; - readDirectory = ts.sys.readDirectory; - // this is necessary to make source references work. - realpath = ts.sys.realpath; } export interface MangleOutput { @@ -339,26 +403,82 @@ export interface MangleOutput { export class Mangler { private readonly allClassDataByKey = new Map(); + private readonly allExportedSymbols = new Set(); private readonly service: ts.LanguageService; + private readonly renameWorkerPool: workerpool.WorkerPool; - constructor(readonly projectPath: string, readonly log: typeof console.log = () => { }) { + constructor( + private readonly projectPath: string, + private readonly log: typeof console.log = () => { }, + private readonly config: { readonly manglePrivateFields: boolean; readonly mangleExports: boolean }, + ) { this.service = ts.createLanguageService(new StaticLanguageServiceHost(projectPath)); + + this.renameWorkerPool = workerpool.pool(path.join(__dirname, 'renameWorker.js'), { + maxWorkers: 1, + minWorkers: 'max' + }); } - computeNewFileContents(strictImplicitPublicHandling?: Set): Map { + async computeNewFileContents(strictImplicitPublicHandling?: Set): Promise> { - // STEP: find all classes and their field info + // STEP: + // - Find all classes and their field info. + // - Find exported symbols. const visit = (node: ts.Node): void => { - if (ts.isClassDeclaration(node) || ts.isClassExpression(node)) { - const anchor = node.name ?? node; - const key = `${node.getSourceFile().fileName}|${anchor.getStart()}`; - if (this.allClassDataByKey.has(key)) { - throw new Error('DUPE?'); + if (this.config.manglePrivateFields) { + if (ts.isClassDeclaration(node) || ts.isClassExpression(node)) { + const anchor = node.name ?? node; + const key = `${node.getSourceFile().fileName}|${anchor.getStart()}`; + if (this.allClassDataByKey.has(key)) { + throw new Error('DUPE?'); + } + this.allClassDataByKey.set(key, new ClassData(node.getSourceFile().fileName, node)); } - this.allClassDataByKey.set(key, new ClassData(node.getSourceFile().fileName, node)); } + + if (this.config.mangleExports) { + // Find exported classes, functions, and vars + if ( + ( + // Exported class + ts.isClassDeclaration(node) + && hasModifier(node, ts.SyntaxKind.ExportKeyword) + && node.name + ) || ( + // Exported function + ts.isFunctionDeclaration(node) + && ts.isSourceFile(node.parent) + && hasModifier(node, ts.SyntaxKind.ExportKeyword) + && node.name && node.body // On named function and not on the overload + ) || ( + // Exported variable + ts.isVariableDeclaration(node) + && hasModifier(node.parent.parent, ts.SyntaxKind.ExportKeyword) // Variable statement is exported + && ts.isSourceFile(node.parent.parent.parent) + ) + + // Disabled for now because we need to figure out how to handle + // enums that are used in monaco or extHost interfaces. + /* || ( + // Exported enum + ts.isEnumDeclaration(node) + && ts.isSourceFile(node.parent) + && hasModifier(node, ts.SyntaxKind.ExportKeyword) + && !hasModifier(node, ts.SyntaxKind.ConstKeyword) // Don't bother mangling const enums because these are inlined + && node.name + */ + ) { + if (isInAmbientContext(node)) { + return; + } + + this.allExportedSymbols.add(new DeclarationData(node.getSourceFile().fileName, node, this.service)); + } + } + ts.forEachChild(node, visit); }; @@ -367,7 +487,7 @@ export class Mangler { ts.forEachChild(file, visit); } } - this.log(`Done collecting classes: ${this.allClassDataByKey.size}`); + this.log(`Done collecting. Classes: ${this.allClassDataByKey.size}. Exported symbols: ${this.allExportedSymbols.size}`); // STEP: connect sub and super-types @@ -433,9 +553,11 @@ export class Mangler { for (const data of this.allClassDataByKey.values()) { ClassData.fillInReplacement(data); } - this.log(`Done creating replacements`); + this.log(`Done creating class replacements`); // STEP: prepare rename edits + this.log(`Starting prepare rename edits`); + type Edit = { newText: string; offset: number; length: number }; const editsByFile = new Map(); @@ -447,9 +569,24 @@ export class Mangler { edits.push(edit); } }; + const appendRename = (newText: string, loc: ts.RenameLocation) => { + appendEdit(loc.fileName, { + newText: (loc.prefixText || '') + newText + (loc.suffixText || ''), + offset: loc.textSpan.start, + length: loc.textSpan.length + }); + }; + + type RenameFn = (projectName: string, fileName: string, pos: number) => ts.RenameLocation[]; + + const renameResults: Array> = []; + + const queueRename = (fileName: string, pos: number, newName: string) => { + renameResults.push(Promise.resolve(this.renameWorkerPool.exec('findRenameLocations', [this.projectPath, fileName, pos])) + .then((locations) => ({ newName, locations }))); + }; for (const data of this.allClassDataByKey.values()) { - if (hasModifier(data.node, ts.SyntaxKind.DeclareKeyword)) { continue; } @@ -469,18 +606,39 @@ export class Mangler { parent = parent.parent; } - const newText = data.lookupShortName(name); - const locations = this.service.findRenameLocations(data.fileName, info.pos, false, false, true) ?? []; - for (const loc of locations) { - appendEdit(loc.fileName, { - newText: (loc.prefixText || '') + newText + (loc.suffixText || ''), - offset: loc.textSpan.start, - length: loc.textSpan.length - }); - } + const newName = data.lookupShortName(name); + queueRename(data.fileName, info.pos, newName); } } + for (const data of this.allExportedSymbols.values()) { + if (data.fileName.endsWith('.d.ts') + || skippedExportMangledProjects.some(proj => data.fileName.includes(proj)) + || skippedExportMangledFiles.some(file => data.fileName.endsWith(file + '.ts')) + ) { + continue; + } + + if (!data.shouldMangle(data.replacementName)) { + continue; + } + + const newText = data.replacementName; + for (const { fileName, offset } of data.locations) { + queueRename(fileName, offset, newText); + } + } + + await Promise.all(renameResults).then((result) => { + for (const { newName, locations } of result) { + for (const loc of locations) { + appendRename(newName, loc); + } + } + }); + + await this.renameWorkerPool.terminate(); + this.log(`Done preparing edits: ${editsByFile.size} files`); // STEP: apply all rename edits (per file) @@ -579,17 +737,32 @@ function hasModifier(node: ts.Node, kind: ts.SyntaxKind) { return Boolean(modifiers?.find(mode => mode.kind === kind)); } +function isInAmbientContext(node: ts.Node): boolean { + for (let p = node.parent; p; p = p.parent) { + if (ts.isModuleDeclaration(p)) { + return true; + } + } + return false; +} + function normalize(path: string): string { return path.replace(/\\/g, '/'); } async function _run() { - - const projectPath = path.join(__dirname, '../../src/tsconfig.json'); - const projectBase = path.dirname(projectPath); + const root = path.join(__dirname, '..', '..', '..'); + const projectBase = path.join(root, 'src'); + const projectPath = path.join(projectBase, 'tsconfig.json'); const newProjectBase = path.join(path.dirname(projectBase), path.basename(projectBase) + '2'); - for await (const [fileName, contents] of new Mangler(projectPath, console.log).computeNewFileContents(new Set(['saveState']))) { + fs.cpSync(projectBase, newProjectBase, { recursive: true }); + + const mangler = new Mangler(projectPath, console.log, { + mangleExports: true, + manglePrivateFields: true, + }); + for (const [fileName, contents] of await mangler.computeNewFileContents(new Set(['saveState']))) { const newFilePath = path.join(newProjectBase, path.relative(projectBase, fileName)); await fs.promises.mkdir(path.dirname(newFilePath), { recursive: true }); await fs.promises.writeFile(newFilePath, contents.out); diff --git a/build/lib/mangle/renameWorker.js b/build/lib/mangle/renameWorker.js new file mode 100644 index 00000000000..ce4b96275a3 --- /dev/null +++ b/build/lib/mangle/renameWorker.js @@ -0,0 +1,20 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +const ts = require("typescript"); +const workerpool = require("workerpool"); +const staticLanguageServiceHost_1 = require("./staticLanguageServiceHost"); +let service; // = ts.createLanguageService(new StaticLanguageServiceHost(projectPath)); +function findRenameLocations(projectPath, fileName, position) { + if (!service) { + service = ts.createLanguageService(new staticLanguageServiceHost_1.StaticLanguageServiceHost(projectPath)); + } + return service.findRenameLocations(fileName, position, false, false, true) ?? []; +} +workerpool.worker({ + findRenameLocations +}); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVuYW1lV29ya2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVuYW1lV29ya2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcsaUNBQWlDO0FBQ2pDLHlDQUF5QztBQUN6QywyRUFBd0U7QUFFeEUsSUFBSSxPQUF1QyxDQUFDLENBQUEsMEVBQTBFO0FBRXRILFNBQVMsbUJBQW1CLENBQzNCLFdBQW1CLEVBQ25CLFFBQWdCLEVBQ2hCLFFBQWdCO0lBRWhCLElBQUksQ0FBQyxPQUFPLEVBQUU7UUFDYixPQUFPLEdBQUcsRUFBRSxDQUFDLHFCQUFxQixDQUFDLElBQUkscURBQXlCLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztLQUMvRTtJQUVELE9BQU8sT0FBTyxDQUFDLG1CQUFtQixDQUFDLFFBQVEsRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7QUFDbEYsQ0FBQztBQUVELFVBQVUsQ0FBQyxNQUFNLENBQUM7SUFDakIsbUJBQW1CO0NBQ25CLENBQUMsQ0FBQyJ9 \ No newline at end of file diff --git a/build/lib/mangle/renameWorker.ts b/build/lib/mangle/renameWorker.ts new file mode 100644 index 00000000000..b5d6bcd5bc9 --- /dev/null +++ b/build/lib/mangle/renameWorker.ts @@ -0,0 +1,26 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as ts from 'typescript'; +import * as workerpool from 'workerpool'; +import { StaticLanguageServiceHost } from './staticLanguageServiceHost'; + +let service: ts.LanguageService | undefined;// = ts.createLanguageService(new StaticLanguageServiceHost(projectPath)); + +function findRenameLocations( + projectPath: string, + fileName: string, + position: number, +): readonly ts.RenameLocation[] { + if (!service) { + service = ts.createLanguageService(new StaticLanguageServiceHost(projectPath)); + } + + return service.findRenameLocations(fileName, position, false, false, true) ?? []; +} + +workerpool.worker({ + findRenameLocations +}); diff --git a/build/lib/mangle/staticLanguageServiceHost.js b/build/lib/mangle/staticLanguageServiceHost.js new file mode 100644 index 00000000000..acf48be8442 --- /dev/null +++ b/build/lib/mangle/staticLanguageServiceHost.js @@ -0,0 +1,65 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.StaticLanguageServiceHost = void 0; +const ts = require("typescript"); +const path = require("path"); +class StaticLanguageServiceHost { + projectPath; + _cmdLine; + _scriptSnapshots = new Map(); + constructor(projectPath) { + this.projectPath = projectPath; + const existingOptions = {}; + const parsed = ts.readConfigFile(projectPath, ts.sys.readFile); + if (parsed.error) { + throw parsed.error; + } + this._cmdLine = ts.parseJsonConfigFileContent(parsed.config, ts.sys, path.dirname(projectPath), existingOptions); + if (this._cmdLine.errors.length > 0) { + throw parsed.error; + } + } + getCompilationSettings() { + return this._cmdLine.options; + } + getScriptFileNames() { + return this._cmdLine.fileNames; + } + getScriptVersion(_fileName) { + return '1'; + } + getProjectVersion() { + return '1'; + } + getScriptSnapshot(fileName) { + let result = this._scriptSnapshots.get(fileName); + if (result === undefined) { + const content = ts.sys.readFile(fileName); + if (content === undefined) { + return undefined; + } + result = ts.ScriptSnapshot.fromString(content); + this._scriptSnapshots.set(fileName, result); + } + return result; + } + getCurrentDirectory() { + return path.dirname(this.projectPath); + } + getDefaultLibFileName(options) { + return ts.getDefaultLibFilePath(options); + } + directoryExists = ts.sys.directoryExists; + getDirectories = ts.sys.getDirectories; + fileExists = ts.sys.fileExists; + readFile = ts.sys.readFile; + readDirectory = ts.sys.readDirectory; + // this is necessary to make source references work. + realpath = ts.sys.realpath; +} +exports.StaticLanguageServiceHost = StaticLanguageServiceHost; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdGljTGFuZ3VhZ2VTZXJ2aWNlSG9zdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInN0YXRpY0xhbmd1YWdlU2VydmljZUhvc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOzs7QUFFaEcsaUNBQWlDO0FBQ2pDLDZCQUE2QjtBQUU3QixNQUFhLHlCQUF5QjtJQUtoQjtJQUhKLFFBQVEsQ0FBdUI7SUFDL0IsZ0JBQWdCLEdBQW9DLElBQUksR0FBRyxFQUFFLENBQUM7SUFFL0UsWUFBcUIsV0FBbUI7UUFBbkIsZ0JBQVcsR0FBWCxXQUFXLENBQVE7UUFDdkMsTUFBTSxlQUFlLEdBQWdDLEVBQUUsQ0FBQztRQUN4RCxNQUFNLE1BQU0sR0FBRyxFQUFFLENBQUMsY0FBYyxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQy9ELElBQUksTUFBTSxDQUFDLEtBQUssRUFBRTtZQUNqQixNQUFNLE1BQU0sQ0FBQyxLQUFLLENBQUM7U0FDbkI7UUFDRCxJQUFJLENBQUMsUUFBUSxHQUFHLEVBQUUsQ0FBQywwQkFBMEIsQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsRUFBRSxlQUFlLENBQUMsQ0FBQztRQUNqSCxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7WUFDcEMsTUFBTSxNQUFNLENBQUMsS0FBSyxDQUFDO1NBQ25CO0lBQ0YsQ0FBQztJQUNELHNCQUFzQjtRQUNyQixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDO0lBQzlCLENBQUM7SUFDRCxrQkFBa0I7UUFDakIsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQztJQUNoQyxDQUFDO0lBQ0QsZ0JBQWdCLENBQUMsU0FBaUI7UUFDakMsT0FBTyxHQUFHLENBQUM7SUFDWixDQUFDO0lBQ0QsaUJBQWlCO1FBQ2hCLE9BQU8sR0FBRyxDQUFDO0lBQ1osQ0FBQztJQUNELGlCQUFpQixDQUFDLFFBQWdCO1FBQ2pDLElBQUksTUFBTSxHQUFtQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2pGLElBQUksTUFBTSxLQUFLLFNBQVMsRUFBRTtZQUN6QixNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUMxQyxJQUFJLE9BQU8sS0FBSyxTQUFTLEVBQUU7Z0JBQzFCLE9BQU8sU0FBUyxDQUFDO2FBQ2pCO1lBQ0QsTUFBTSxHQUFHLEVBQUUsQ0FBQyxjQUFjLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQy9DLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1NBQzVDO1FBQ0QsT0FBTyxNQUFNLENBQUM7SUFDZixDQUFDO0lBQ0QsbUJBQW1CO1FBQ2xCLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDdkMsQ0FBQztJQUNELHFCQUFxQixDQUFDLE9BQTJCO1FBQ2hELE9BQU8sRUFBRSxDQUFDLHFCQUFxQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzFDLENBQUM7SUFDRCxlQUFlLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUM7SUFDekMsY0FBYyxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDO0lBQ3ZDLFVBQVUsR0FBRyxFQUFFLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQztJQUMvQixRQUFRLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7SUFDM0IsYUFBYSxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDO0lBQ3JDLG9EQUFvRDtJQUNwRCxRQUFRLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7Q0FDM0I7QUFyREQsOERBcURDIn0= \ No newline at end of file diff --git a/build/lib/mangle/staticLanguageServiceHost.ts b/build/lib/mangle/staticLanguageServiceHost.ts new file mode 100644 index 00000000000..c2793342ce3 --- /dev/null +++ b/build/lib/mangle/staticLanguageServiceHost.ts @@ -0,0 +1,62 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as ts from 'typescript'; +import * as path from 'path'; + +export class StaticLanguageServiceHost implements ts.LanguageServiceHost { + + private readonly _cmdLine: ts.ParsedCommandLine; + private readonly _scriptSnapshots: Map = new Map(); + + constructor(readonly projectPath: string) { + const existingOptions: Partial = {}; + const parsed = ts.readConfigFile(projectPath, ts.sys.readFile); + if (parsed.error) { + throw parsed.error; + } + this._cmdLine = ts.parseJsonConfigFileContent(parsed.config, ts.sys, path.dirname(projectPath), existingOptions); + if (this._cmdLine.errors.length > 0) { + throw parsed.error; + } + } + getCompilationSettings(): ts.CompilerOptions { + return this._cmdLine.options; + } + getScriptFileNames(): string[] { + return this._cmdLine.fileNames; + } + getScriptVersion(_fileName: string): string { + return '1'; + } + getProjectVersion(): string { + return '1'; + } + getScriptSnapshot(fileName: string): ts.IScriptSnapshot | undefined { + let result: ts.IScriptSnapshot | undefined = this._scriptSnapshots.get(fileName); + if (result === undefined) { + const content = ts.sys.readFile(fileName); + if (content === undefined) { + return undefined; + } + result = ts.ScriptSnapshot.fromString(content); + this._scriptSnapshots.set(fileName, result); + } + return result; + } + getCurrentDirectory(): string { + return path.dirname(this.projectPath); + } + getDefaultLibFileName(options: ts.CompilerOptions): string { + return ts.getDefaultLibFilePath(options); + } + directoryExists = ts.sys.directoryExists; + getDirectories = ts.sys.getDirectories; + fileExists = ts.sys.fileExists; + readFile = ts.sys.readFile; + readDirectory = ts.sys.readDirectory; + // this is necessary to make source references work. + realpath = ts.sys.realpath; +} diff --git a/build/lib/mangleTypeScript.js b/build/lib/mangleTypeScript.js index 7948e917e31..45b50148d12 100644 --- a/build/lib/mangleTypeScript.js +++ b/build/lib/mangleTypeScript.js @@ -16,18 +16,20 @@ class ShortIdent { 'default', 'delete', 'do', 'else', 'export', 'extends', 'false', 'finally', 'for', 'function', 'if', 'import', 'in', 'instanceof', 'let', 'new', 'null', 'return', 'static', 'super', 'switch', 'this', 'throw', 'true', 'try', 'typeof', 'var', 'void', 'while', 'with', 'yield']); - static _alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''); + static _alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890$_'.split(''); _value = 0; _isNameTaken; - constructor(isNameTaken) { - this._isNameTaken = name => ShortIdent._keywords.has(name) || isNameTaken(name); + prefix; + constructor(prefix, isNameTaken) { + this.prefix = prefix; + this._isNameTaken = name => ShortIdent._keywords.has(name) || /^[_0-9]/.test(name) || isNameTaken(name); } - next() { - const candidate = ShortIdent.convert(this._value); + next(localIsNameTaken) { + const candidate = this.prefix + ShortIdent.convert(this._value); this._value++; - if (this._isNameTaken(candidate)) { + if (this._isNameTaken(candidate) || localIsNameTaken?.(candidate)) { // try again - return this.next(); + return this.next(localIsNameTaken); } return candidate; } @@ -160,7 +162,7 @@ class ClassData { ClassData.fillInReplacement(data.parent); } data.replacements = new Map(); - const identPool = new ShortIdent(name => { + const identPool = new ShortIdent('', name => { // locally taken if (data._isNameTaken(name)) { return true; @@ -210,11 +212,8 @@ class ClassData { } } } - if (this.node.getSourceFile().identifiers instanceof Map) { - // taken by any other usage - if (this.node.getSourceFile().identifiers.has(name)) { - return true; - } + if (isNameTakenInFile(this.node, name)) { + return true; } return false; } @@ -236,6 +235,104 @@ class ClassData { child.parent = this; } } +function isNameTakenInFile(node, name) { + const identifiers = node.getSourceFile().identifiers; + if (identifiers instanceof Map) { + if (identifiers.has(name)) { + return true; + } + } + return false; +} +const fileIdents = new class { + idents = new ShortIdent('$', () => false); + next(file) { + return this.idents.next(name => isNameTakenInFile(file, name)); + } +}; +const skippedFiles = [ + // Build + 'css.build.ts', + 'nls.build.ts', + // Monaco + 'editorCommon.ts', + 'editorOptions.ts', + 'editorZoom.ts', + 'standaloneEditor.ts', + 'standaloneLanguages.ts', + // Generated + 'extensionsApiProposals.ts', + // Module passed around as type + 'pfs.ts', +]; +class DeclarationData { + fileName; + node; + replacementName; + constructor(fileName, node) { + this.fileName = fileName; + this.node = node; + this.replacementName = fileIdents.next(node.getSourceFile()); + } + get locations() { + return [{ + fileName: this.fileName, + offset: this.node.name.getStart() + }]; + } + shouldMangle(newName) { + // New name is longer the existing one :'( + if (newName.length >= this.node.name.getText().length) { + return false; + } + // Don't mangle functions we've explicitly opted out + if (this.node.getFullText().includes('@skipMangle')) { + return false; + } + // Don't mangle functions in the monaco editor API. + if (skippedFiles.some(file => this.node.getSourceFile().fileName.endsWith(file))) { + return false; + } + return true; + } +} +class ConstData { + fileName; + statement; + decl; + service; + replacementName; + constructor(fileName, statement, decl, service) { + this.fileName = fileName; + this.statement = statement; + this.decl = decl; + this.service = service; + this.replacementName = fileIdents.next(statement.getSourceFile()); + } + get locations() { + // If the const aliases any types, we need to rename those too + const definitionResult = this.service.getDefinitionAndBoundSpan(this.decl.getSourceFile().fileName, this.decl.name.getStart()); + if (definitionResult?.definitions && definitionResult.definitions.length > 1) { + return definitionResult.definitions.map(x => ({ fileName: x.fileName, offset: x.textSpan.start })); + } + return [{ fileName: this.fileName, offset: this.decl.name.getStart() }]; + } + shouldMangle(newName) { + // New name is longer the existing one :'( + if (newName.length >= this.decl.name.getText().length) { + return false; + } + // Don't mangle functions we've explicitly opted out + if (this.statement.getFullText().includes('@skipMangle')) { + return false; + } + // Don't mangle functions in some files + if (skippedFiles.some(file => this.decl.getSourceFile().fileName.endsWith(file))) { + return false; + } + return true; + } +} class StaticLanguageServiceHost { projectPath; _cmdLine; @@ -303,6 +400,7 @@ class Mangler { projectPath; log; allClassDataByKey = new Map(); + allExportedDeclarationsByKey = new Map(); service; constructor(projectPath, log = () => { }) { this.projectPath = projectPath; @@ -310,7 +408,7 @@ class Mangler { this.service = ts.createLanguageService(new StaticLanguageServiceHost(projectPath)); } computeNewFileContents(strictImplicitPublicHandling) { - // STEP: find all classes and their field info + // STEP find all classes and their field info. Find all exported consts and functions. const visit = (node) => { if (ts.isClassDeclaration(node) || ts.isClassExpression(node)) { const anchor = node.name ?? node; @@ -320,6 +418,39 @@ class Mangler { } this.allClassDataByKey.set(key, new ClassData(node.getSourceFile().fileName, node)); } + if (ts.isClassDeclaration(node) && hasModifier(node, ts.SyntaxKind.ExportKeyword)) { + if (node.name) { + const anchor = node.name; + const key = `${node.getSourceFile().fileName}|${anchor.getStart()}`; + if (this.allExportedDeclarationsByKey.has(key)) { + throw new Error('DUPE?'); + } + this.allExportedDeclarationsByKey.set(key, new DeclarationData(node.getSourceFile().fileName, node)); + } + } + if (ts.isFunctionDeclaration(node) + && ts.isSourceFile(node.parent) + && hasModifier(node, ts.SyntaxKind.ExportKeyword)) { + if (node.name && node.body) { // On named function and not on the overload + const anchor = node.name; + const key = `${node.getSourceFile().fileName}|${anchor.getStart()}`; + if (this.allExportedDeclarationsByKey.has(key)) { + throw new Error('DUPE?'); + } + this.allExportedDeclarationsByKey.set(key, new DeclarationData(node.getSourceFile().fileName, node)); + } + } + if (ts.isVariableStatement(node) + && ts.isSourceFile(node.parent) + && hasModifier(node, ts.SyntaxKind.ExportKeyword)) { + for (const decl of node.declarationList.declarations) { + const key = `${decl.getSourceFile().fileName}|${decl.name.getStart()}`; + if (this.allExportedDeclarationsByKey.has(key)) { + throw new Error('DUPE?'); + } + this.allExportedDeclarationsByKey.set(key, new ConstData(node.getSourceFile().fileName, node, decl, this.service)); + } + } ts.forEachChild(node, visit); }; for (const file of this.service.getProgram().getSourceFiles()) { @@ -327,7 +458,7 @@ class Mangler { ts.forEachChild(file, visit); } } - this.log(`Done collecting classes: ${this.allClassDataByKey.size}`); + this.log(`Done collecting. Classes: ${this.allClassDataByKey.size}. Exported const/fn: ${this.allExportedDeclarationsByKey.size}`); // STEP: connect sub and super-types const setupParents = (data) => { const extendsClause = data.node.heritageClauses?.find(h => h.token === ts.SyntaxKind.ExtendsKeyword); @@ -385,7 +516,7 @@ class Mangler { for (const data of this.allClassDataByKey.values()) { ClassData.fillInReplacement(data); } - this.log(`Done creating replacements`); + this.log(`Done creating class replacements`); const editsByFile = new Map(); const appendEdit = (fileName, edit) => { const edits = editsByFile.get(fileName); @@ -396,6 +527,13 @@ class Mangler { edits.push(edit); } }; + const appendRename = (newText, loc) => { + appendEdit(loc.fileName, { + newText: (loc.prefixText || '') + newText + (loc.suffixText || ''), + offset: loc.textSpan.start, + length: loc.textSpan.length + }); + }; for (const data of this.allClassDataByKey.values()) { if (hasModifier(data.node, ts.SyntaxKind.DeclareKeyword)) { continue; @@ -416,11 +554,19 @@ class Mangler { const newText = data.lookupShortName(name); const locations = this.service.findRenameLocations(data.fileName, info.pos, false, false, true) ?? []; for (const loc of locations) { - appendEdit(loc.fileName, { - newText: (loc.prefixText || '') + newText + (loc.suffixText || ''), - offset: loc.textSpan.start, - length: loc.textSpan.length - }); + appendRename(newText, loc); + } + } + } + for (const data of this.allExportedDeclarationsByKey.values()) { + if (!data.shouldMangle(data.replacementName)) { + continue; + } + const newText = data.replacementName; + for (const { fileName, offset } of data.locations) { + const locations = this.service.findRenameLocations(fileName, offset, false, false, true) ?? []; + for (const loc of locations) { + appendRename(newText, loc); } } } @@ -514,6 +660,7 @@ async function _run() { const projectPath = path.join(__dirname, '../../src/tsconfig.json'); const projectBase = path.dirname(projectPath); const newProjectBase = path.join(path.dirname(projectBase), path.basename(projectBase) + '2'); + fs.cpSync(projectBase, newProjectBase, { recursive: true }); for await (const [fileName, contents] of new Mangler(projectPath, console.log).computeNewFileContents(new Set(['saveState']))) { const newFilePath = path.join(newProjectBase, path.relative(projectBase, fileName)); await fs.promises.mkdir(path.dirname(newFilePath), { recursive: true }); @@ -526,4 +673,4 @@ async function _run() { if (__filename === process_1.argv[1]) { _run(); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mangleTypeScript.js","sourceRoot":"","sources":["mangleTypeScript.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,iCAAiC;AACjC,6BAA6B;AAC7B,yBAAyB;AACzB,qCAA+B;AAC/B,2CAAyD;AACzD,6BAAoC;AAEpC,MAAM,UAAU;IAEP,MAAM,CAAC,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU;QAC9G,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI;QACnG,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO;QAC1G,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5D,MAAM,CAAC,SAAS,GAAG,sDAAsD,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEpF,MAAM,GAAG,CAAC,CAAC;IACF,YAAY,CAA4B;IAEzD,YAAY,WAAsC;QACjD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IACjF,CAAC;IAED,IAAI;QACH,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;YACjC,YAAY;YACZ,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;SACnB;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAEO,MAAM,CAAC,OAAO,CAAC,CAAS;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QACnC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,GAAG;YACF,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC;YACtB,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB,QAAQ,CAAC,GAAG,CAAC,EAAE;QAChB,OAAO,MAAM,CAAC;IACf,CAAC;;AAGF,IAAW,SAIV;AAJD,WAAW,SAAS;IACnB,6CAAM,CAAA;IACN,mDAAS,CAAA;IACT,+CAAO,CAAA;AACR,CAAC,EAJU,SAAS,KAAT,SAAS,QAInB;AAED,MAAM,SAAS;IAUJ;IACA;IATV,MAAM,GAAG,IAAI,GAAG,EAA4C,CAAC;IAErD,YAAY,CAAkC;IAEtD,MAAM,CAAwB;IAC9B,QAAQ,CAA0B;IAElC,YACU,QAAgB,EAChB,IAA8C;QAEvD,gFAAgF;QAChF,gFAAgF;QAJvE,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAA0C;QAKvD,MAAM,UAAU,GAA4B,EAAE,CAAC;QAC/C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YAClC,IAAI,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE;gBACnC,oBAAoB;gBACpB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;gBAC5C,uBAAuB;gBACvB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;gBACpC,8BAA8B;gBAC9B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;gBACpC,8BAA8B;gBAC9B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE;gBAC/C,iDAAiD;gBACjD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,EAAE;oBACtC,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;2BAChD,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC;2BAClD,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;2BAC/C,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EACnD;wBACD,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBACvB;iBACD;aACD;SACD;QACD,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAChC,MAAM,KAAK,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC,KAAK,EAAE;gBACX,SAAS;aACT;YACD,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,IAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC/D;IACF,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,IAAyB;QACtD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACf,OAAO,SAAS,CAAC;SACjB;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACtB,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE;YACrD,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE;gBACzD,+CAA+C;gBAC/C,OAAO;aACP;YACD,UAAU;YACV,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC/C;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,MAAM,CAAC,aAAa,CAAC,IAAa;QACzC,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YACpD,iCAAyB;SACzB;aAAM,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;YAC7D,mCAA2B;SAC3B;aAAM;YACN,gCAAwB;SACxB;IACF,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,IAAe;QACnC,OAAO,IAAI,8BAAsB;eAC7B,IAAI,gCAAwB,CAC9B;IACH,CAAC;IAED,MAAM,CAAC,gCAAgC,CAAC,IAAe,EAAE,eAAkE;QAC1H,UAAU;QACV,iFAAiF;QACjF,iFAAiF;QACjF,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YACvC,IAAI,IAAI,CAAC,IAAI,6BAAqB,EAAE;gBACnC,SAAS;aACT;YACD,IAAI,MAAM,GAA0B,IAAI,CAAC,MAAM,CAAC;YAChD,OAAO,MAAM,EAAE;gBACd,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,gCAAwB,EAAE;oBAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,6BAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,GAAG,CAAC,CAAC;oBAC1G,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAClF,eAAe,CAAC,IAAI,EAAE,IAAI,IAAI,UAAU,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC;oBAEzH,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,2BAAmB,CAAC;iBACjD;gBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACvB;SACD;IACF,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,IAAe;QAEvC,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,eAAe;YACf,OAAO;SACP;QAED,wBAAwB;QACxB,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACzC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QAE9B,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;YAEvC,gBAAgB;YAChB,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;gBAC5B,OAAO,IAAI,CAAC;aACZ;YAED,UAAU;YACV,IAAI,MAAM,GAA0B,IAAI,CAAC,MAAM,CAAC;YAChD,OAAO,MAAM,EAAE;gBACd,IAAI,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;oBAC9B,OAAO,IAAI,CAAC;iBACZ;gBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACvB;YAED,WAAW;YACX,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAClB,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACjC,OAAO,KAAK,CAAC,MAAM,EAAE;oBACpB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;oBAC1B,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;wBAC5B,OAAO,IAAI,CAAC;qBACZ;oBACD,IAAI,IAAI,CAAC,QAAQ,EAAE;wBAClB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;qBAC7B;iBACD;aACD;YAED,OAAO,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YACvC,IAAI,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACvC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;gBACnC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;aACvC;SACD;IACF,CAAC;IAED,kEAAkE;IAClE,kDAAkD;IAC1C,YAAY,CAAC,IAAY;QAChC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,CAAC,EAAE;YACnF,eAAe;YACf,OAAO,IAAI,CAAC;SACZ;QACD,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE;gBACnD,IAAI,SAAS,KAAK,IAAI,EAAE;oBACvB,6CAA6C;oBAC7C,OAAO,IAAI,CAAC;iBACZ;aACD;SACD;QACD,IAAU,IAAI,CAAC,IAAI,CAAC,aAAa,EAAG,CAAC,WAAW,YAAY,GAAG,EAAE;YAChE,2BAA2B;YAC3B,IAAU,IAAI,CAAC,IAAI,CAAC,aAAa,EAAG,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC3D,OAAO,IAAI,CAAC;aACZ;SACD;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,eAAe,CAAC,IAAY;QAC3B,IAAI,KAAK,GAAG,IAAI,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QAC1C,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,OAAO,MAAM,EAAE;YACd,IAAI,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,gCAAwB,EAAE;gBAC5F,KAAK,GAAG,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAE,IAAI,KAAK,CAAC;aACjD;YACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;SACvB;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,sBAAsB;IAEtB,QAAQ,CAAC,KAAgB;QACxB,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACD;AAED,MAAM,yBAAyB;IAKT;IAHJ,QAAQ,CAAuB;IAC/B,gBAAgB,GAAoC,IAAI,GAAG,EAAE,CAAC;IAE/E,YAAqB,WAAmB;QAAnB,gBAAW,GAAX,WAAW,CAAQ;QACvC,MAAM,eAAe,GAAgC,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/D,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,MAAM,MAAM,CAAC,KAAK,CAAC;SACnB;QACD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,0BAA0B,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,eAAe,CAAC,CAAC;QACjH,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,MAAM,MAAM,CAAC,KAAK,CAAC;SACnB;IACF,CAAC;IACD,sBAAsB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC9B,CAAC;IACD,kBAAkB;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;IAChC,CAAC;IACD,gBAAgB,CAAC,SAAiB;QACjC,OAAO,GAAG,CAAC;IACZ,CAAC;IACD,iBAAiB;QAChB,OAAO,GAAG,CAAC;IACZ,CAAC;IACD,iBAAiB,CAAC,QAAgB;QACjC,IAAI,MAAM,GAAmC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjF,IAAI,MAAM,KAAK,SAAS,EAAE;YACzB,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,OAAO,KAAK,SAAS,EAAE;gBAC1B,OAAO,SAAS,CAAC;aACjB;YACD,MAAM,GAAG,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC5C;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IACD,mBAAmB;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC;IACD,qBAAqB,CAAC,OAA2B;QAChD,OAAO,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IACD,eAAe,GAAG,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC;IACzC,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC;IACvC,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;IAC/B,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC3B,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC;IACrC,oDAAoD;IACpD,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;CAC3B;AAOD;;;;;;;;GAQG;AACH,MAAa,OAAO;IAME;IAA8B;IAJlC,iBAAiB,GAAG,IAAI,GAAG,EAAqB,CAAC;IAEjD,OAAO,CAAqB;IAE7C,YAAqB,WAAmB,EAAW,MAA0B,GAAG,EAAE,GAAG,CAAC;QAAjE,gBAAW,GAAX,WAAW,CAAQ;QAAW,QAAG,GAAH,GAAG,CAAgC;QACrF,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,qBAAqB,CAAC,IAAI,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,sBAAsB,CAAC,4BAA0C;QAEhE,8CAA8C;QAE9C,MAAM,KAAK,GAAG,CAAC,IAAa,EAAQ,EAAE;YACrC,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;gBAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;gBACjC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACpE,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACpC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;iBACzB;gBACD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;aACpF;YACD,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,cAAc,EAAE,EAAE;YAC/D,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAC5B,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aAC7B;SACD;QACD,IAAI,CAAC,GAAG,CAAC,4BAA4B,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;QAGpE,qCAAqC;QAErC,MAAM,YAAY,GAAG,CAAC,IAAe,EAAE,EAAE;YACxC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YACrG,IAAI,CAAC,aAAa,EAAE;gBACnB,oBAAoB;gBACpB,OAAO;aACP;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7G,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/B,2CAA2C;gBAC3C,OAAO;aACP;YAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,sCAAsC;gBACtC,OAAO;aACP;YAED,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;YAC1B,MAAM,GAAG,GAAG,GAAG,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAClE,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,EAAE;gBACZ,mDAAmD;gBACnD,OAAO;aACP;YACD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,YAAY,CAAC,IAAI,CAAC,CAAC;SACnB;QAED,uEAAuE;QACvE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;QAC/C,IAAI,sBAAsB,GAAG,KAAK,CAAC;QACnC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,SAAS,CAAC,gCAAgC,CAAC,IAAI,EAAE,CAAC,IAAY,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;gBAC5E,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,GAAG,EAAE;oBACR,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACd;qBAAM;oBACN,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC5B;gBAED,IAAI,4BAA4B,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC5E,sBAAsB,GAAG,IAAI,CAAC;iBAC9B;YACF,CAAC,CAAC,CAAC;SACH;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,UAAU,EAAE;YACrC,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,8BAA8B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SACvE;QACD,IAAI,sBAAsB,EAAE;YAC3B,MAAM,OAAO,GAAG,sIAAsI,CAAC;YACvJ,IAAI,CAAC,GAAG,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;SACzB;QAED,iDAAiD;QACjD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAClC;QACD,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QAIvC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;QAE9C,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,IAAU,EAAE,EAAE;YACnD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,EAAE;gBACX,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;aAClC;iBAAM;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACjB;QACF,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YAEnD,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;gBACzD,SAAS;aACT;YAED,MAAM,EAAE,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC/C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACxC,SAAS,MAAM,CAAC;iBAChB;gBAED,oDAAoD;gBACpD,uDAAuD;gBACvD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBACzB,OAAO,MAAM,EAAE;oBACd,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,6BAAqB,EAAE;wBACvD,SAAS,MAAM,CAAC;qBAChB;oBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;iBACvB;gBAED,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtG,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;oBAC5B,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE;wBACxB,OAAO,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,GAAG,OAAO,GAAG,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;wBAClE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK;wBAC1B,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM;qBAC3B,CAAC,CAAC;iBACH;aACD;SACD;QAED,IAAI,CAAC,GAAG,CAAC,yBAAyB,WAAW,CAAC,IAAI,QAAQ,CAAC,CAAC;QAE5D,0CAA0C;QAC1C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC/C,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,cAAc,EAAE,EAAE;YAE/D,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,kBAAkB,EAAE,CAAC;YAChF,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,aAAa,GAAG,OAAO,IAAI,IAAA,mBAAa,EAAC,UAAU,IAAI,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEpF,cAAc;YACd,IAAI,SAAyC,CAAC;YAE9C,IAAI,WAAmB,CAAC;YACxB,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,CAAC,KAAK,EAAE;gBACX,YAAY;gBACZ,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;aAEjC;iBAAM;gBACN,uBAAuB;gBACvB,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC7E,MAAM,cAAc,GAAG,IAAI,GAAG,EAAqB,CAAC;gBAEpD,gBAAgB;gBAChB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAEhD,IAAI,QAA0B,CAAC;gBAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;oBACzB,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE;wBAChD,EAAE;wBACF,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAAE;4BACzE,IAAI,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;4BACvE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;yBACpC;6BAAM;4BACN,SAAS;yBACT;qBACD;oBACD,QAAQ,GAAG,IAAI,CAAC;oBAChB,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACvF,UAAU,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;oBAEvD,cAAc;oBACd,MAAM,GAAG,GAAG,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAG5D,IAAI,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC5C,IAAI,CAAC,QAAQ,EAAE;wBACd,QAAQ,GAAG,EAAE,CAAC;wBACd,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;qBACvC;oBACD,QAAQ,CAAC,OAAO,CAAC;wBAChB,MAAM,EAAE,gBAAgB;wBACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;wBACvD,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;wBACxD,IAAI,EAAE,WAAW;qBACjB,EAAE;wBACF,MAAM,EAAE,gBAAgB;wBACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE;wBACrE,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;qBAC9E,CAAC,CAAC;iBACH;gBAED,oEAAoE;gBACpE,SAAS,GAAG,IAAI,+BAAkB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;gBACtG,SAAS,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBACjE,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,cAAc,EAAE;oBAC1C,IAAI,SAAS,GAAG,CAAC,CAAC;oBAClB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;wBAC/B,SAAS,CAAC,UAAU,CAAC;4BACpB,GAAG,OAAO;4BACV,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,SAAS,EAAE;yBACzF,CAAC,CAAC;wBACH,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;qBAChE;iBACD;gBAED,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;SAClF;QAED,IAAI,CAAC,GAAG,CAAC,SAAS,UAAU,GAAG,IAAI,UAAU,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC;IACf,CAAC;CACD;AA1OD,0BA0OC;AAED,gBAAgB;AAEhB,SAAS,WAAW,CAAC,IAAa,EAAE,IAAmB;IACtD,MAAM,SAAS,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,OAAO,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,KAAK,UAAU,IAAI;IAElB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC;IAE9F,IAAI,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;QAC9H,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QACpF,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxE,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,QAAQ,CAAC,SAAS,EAAE;YACvB,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,GAAG,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;SACtE;KACD;AACF,CAAC;AAED,IAAI,UAAU,KAAK,cAAI,CAAC,CAAC,CAAC,EAAE;IAC3B,IAAI,EAAE,CAAC;CACP"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mangleTypeScript.js","sourceRoot":"","sources":["mangleTypeScript.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,iCAAiC;AACjC,6BAA6B;AAC7B,yBAAyB;AACzB,qCAA+B;AAC/B,2CAAyD;AACzD,6BAAoC;AAEpC,MAAM,UAAU;IAEP,MAAM,CAAC,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU;QAC9G,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI;QACnG,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO;QAC1G,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5D,MAAM,CAAC,SAAS,GAAG,kEAAkE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEhG,MAAM,GAAG,CAAC,CAAC;IACF,YAAY,CAA4B;IACxC,MAAM,CAAS;IAEhC,YAAY,MAAc,EAAE,WAAsC;QACjE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IACzG,CAAC;IAED,IAAI,CAAC,gBAA4C;QAChD,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,gBAAgB,EAAE,CAAC,SAAS,CAAC,EAAE;YAClE,YAAY;YACZ,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACnC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAEO,MAAM,CAAC,OAAO,CAAC,CAAS;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QACnC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,GAAG;YACF,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC;YACtB,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB,QAAQ,CAAC,GAAG,CAAC,EAAE;QAChB,OAAO,MAAM,CAAC;IACf,CAAC;;AAGF,IAAW,SAIV;AAJD,WAAW,SAAS;IACnB,6CAAM,CAAA;IACN,mDAAS,CAAA;IACT,+CAAO,CAAA;AACR,CAAC,EAJU,SAAS,KAAT,SAAS,QAInB;AAED,MAAM,SAAS;IAUJ;IACA;IATV,MAAM,GAAG,IAAI,GAAG,EAA4C,CAAC;IAErD,YAAY,CAAkC;IAEtD,MAAM,CAAwB;IAC9B,QAAQ,CAA0B;IAElC,YACU,QAAgB,EAChB,IAA8C;QAEvD,gFAAgF;QAChF,gFAAgF;QAJvE,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAA0C;QAKvD,MAAM,UAAU,GAA4B,EAAE,CAAC;QAC/C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YAClC,IAAI,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE;gBACnC,oBAAoB;gBACpB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;gBAC5C,uBAAuB;gBACvB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;gBACpC,8BAA8B;gBAC9B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;gBACpC,8BAA8B;gBAC9B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAExB;iBAAM,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE;gBAC/C,iDAAiD;gBACjD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,EAAE;oBACtC,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;2BAChD,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC;2BAClD,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;2BAC/C,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EACnD;wBACD,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBACvB;iBACD;aACD;SACD;QACD,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAChC,MAAM,KAAK,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC,KAAK,EAAE;gBACX,SAAS;aACT;YACD,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,IAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC/D;IACF,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,IAAyB;QACtD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACf,OAAO,SAAS,CAAC;SACjB;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACtB,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE;YACrD,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE;gBACzD,+CAA+C;gBAC/C,OAAO;aACP;YACD,UAAU;YACV,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC/C;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,MAAM,CAAC,aAAa,CAAC,IAAa;QACzC,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YACpD,iCAAyB;SACzB;aAAM,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;YAC7D,mCAA2B;SAC3B;aAAM;YACN,gCAAwB;SACxB;IACF,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,IAAe;QACnC,OAAO,IAAI,8BAAsB;eAC7B,IAAI,gCAAwB,CAC9B;IACH,CAAC;IAED,MAAM,CAAC,gCAAgC,CAAC,IAAe,EAAE,eAAkE;QAC1H,UAAU;QACV,iFAAiF;QACjF,iFAAiF;QACjF,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YACvC,IAAI,IAAI,CAAC,IAAI,6BAAqB,EAAE;gBACnC,SAAS;aACT;YACD,IAAI,MAAM,GAA0B,IAAI,CAAC,MAAM,CAAC;YAChD,OAAO,MAAM,EAAE;gBACd,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,gCAAwB,EAAE;oBAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,6BAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,GAAG,CAAC,CAAC;oBAC1G,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAClF,eAAe,CAAC,IAAI,EAAE,IAAI,IAAI,UAAU,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC;oBAEzH,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,2BAAmB,CAAC;iBACjD;gBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACvB;SACD;IACF,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,IAAe;QAEvC,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,eAAe;YACf,OAAO;SACP;QAED,wBAAwB;QACxB,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACzC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QAE9B,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE;YAE3C,gBAAgB;YAChB,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;gBAC5B,OAAO,IAAI,CAAC;aACZ;YAED,UAAU;YACV,IAAI,MAAM,GAA0B,IAAI,CAAC,MAAM,CAAC;YAChD,OAAO,MAAM,EAAE;gBACd,IAAI,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;oBAC9B,OAAO,IAAI,CAAC;iBACZ;gBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;aACvB;YAED,WAAW;YACX,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAClB,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACjC,OAAO,KAAK,CAAC,MAAM,EAAE;oBACpB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;oBAC1B,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;wBAC5B,OAAO,IAAI,CAAC;qBACZ;oBACD,IAAI,IAAI,CAAC,QAAQ,EAAE;wBAClB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;qBAC7B;iBACD;aACD;YAED,OAAO,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;YACvC,IAAI,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACvC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;gBACnC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;aACvC;SACD;IACF,CAAC;IAED,kEAAkE;IAClE,kDAAkD;IAC1C,YAAY,CAAC,IAAY;QAChC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,CAAC,EAAE;YACnF,eAAe;YACf,OAAO,IAAI,CAAC;SACZ;QACD,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE;gBACnD,IAAI,SAAS,KAAK,IAAI,EAAE;oBACvB,6CAA6C;oBAC7C,OAAO,IAAI,CAAC;iBACZ;aACD;SACD;QAED,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YACvC,OAAO,IAAI,CAAC;SACZ;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAED,eAAe,CAAC,IAAY;QAC3B,IAAI,KAAK,GAAG,IAAI,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QAC1C,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,OAAO,MAAM,EAAE;YACd,IAAI,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,gCAAwB,EAAE;gBAC5F,KAAK,GAAG,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,IAAI,CAAE,IAAI,KAAK,CAAC;aACjD;YACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;SACvB;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,sBAAsB;IAEtB,QAAQ,CAAC,KAAgB;QACxB,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACD;AAED,SAAS,iBAAiB,CAAC,IAAa,EAAE,IAAY;IACrD,MAAM,WAAW,GAAS,IAAI,CAAC,aAAa,EAAG,CAAC,WAAW,CAAC;IAC5D,IAAI,WAAW,YAAY,GAAG,EAAE;QAC/B,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC;SACZ;KACD;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,GAAG,IAAI;IACL,MAAM,GAAG,IAAI,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IAE3D,IAAI,CAAC,IAAmB;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;CACD,CAAC;AAEF,MAAM,YAAY,GAAG;IACpB,QAAQ;IACR,cAAc;IACd,cAAc;IAEd,SAAS;IACT,iBAAiB;IACjB,kBAAkB;IAClB,eAAe;IACf,qBAAqB;IACrB,wBAAwB;IAExB,YAAY;IACZ,2BAA2B;IAE3B,+BAA+B;IAC/B,QAAQ;CACR,CAAC;AAEF,MAAM,eAAe;IAKV;IACA;IAJD,eAAe,CAAS;IAEjC,YACU,QAAgB,EAChB,IAAkD;QADlD,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAA8C;QAE3D,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,CAAC;gBACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,QAAQ,EAAE;aAClC,CAAC,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,OAAe;QAC3B,0CAA0C;QAC1C,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE;YACvD,OAAO,KAAK,CAAC;SACb;QAED,oDAAoD;QACpD,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YACpD,OAAO,KAAK,CAAC;SACb;QAED,mDAAmD;QACnD,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE;YACjF,OAAO,KAAK,CAAC;SACb;QAED,OAAO,IAAI,CAAC;IACb,CAAC;CACD;AAED,MAAM,SAAS;IAKJ;IACA;IACA;IACQ;IANT,eAAe,CAAS;IAEjC,YACU,QAAgB,EAChB,SAA+B,EAC/B,IAA4B,EACpB,OAA2B;QAHnC,aAAQ,GAAR,QAAQ,CAAQ;QAChB,cAAS,GAAT,SAAS,CAAsB;QAC/B,SAAI,GAAJ,IAAI,CAAwB;QACpB,YAAO,GAAP,OAAO,CAAoB;QAE5C,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,SAAS;QACZ,8DAA8D;QAC9D,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/H,IAAI,gBAAgB,EAAE,WAAW,IAAI,gBAAgB,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7E,OAAO,gBAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SACnG;QAED,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,YAAY,CAAC,OAAe;QAC3B,0CAA0C;QAC1C,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE;YACtD,OAAO,KAAK,CAAC;SACb;QAED,oDAAoD;QACpD,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YACzD,OAAO,KAAK,CAAC;SACb;QAED,uCAAuC;QACvC,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE;YACjF,OAAO,KAAK,CAAC;SACb;QAED,OAAO,IAAI,CAAC;IACb,CAAC;CACD;AAED,MAAM,yBAAyB;IAKT;IAHJ,QAAQ,CAAuB;IAC/B,gBAAgB,GAAoC,IAAI,GAAG,EAAE,CAAC;IAE/E,YAAqB,WAAmB;QAAnB,gBAAW,GAAX,WAAW,CAAQ;QACvC,MAAM,eAAe,GAAgC,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/D,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,MAAM,MAAM,CAAC,KAAK,CAAC;SACnB;QACD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,0BAA0B,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,eAAe,CAAC,CAAC;QACjH,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,MAAM,MAAM,CAAC,KAAK,CAAC;SACnB;IACF,CAAC;IACD,sBAAsB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC9B,CAAC;IACD,kBAAkB;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;IAChC,CAAC;IACD,gBAAgB,CAAC,SAAiB;QACjC,OAAO,GAAG,CAAC;IACZ,CAAC;IACD,iBAAiB;QAChB,OAAO,GAAG,CAAC;IACZ,CAAC;IACD,iBAAiB,CAAC,QAAgB;QACjC,IAAI,MAAM,GAAmC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjF,IAAI,MAAM,KAAK,SAAS,EAAE;YACzB,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,OAAO,KAAK,SAAS,EAAE;gBAC1B,OAAO,SAAS,CAAC;aACjB;YACD,MAAM,GAAG,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC5C;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IACD,mBAAmB;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC;IACD,qBAAqB,CAAC,OAA2B;QAChD,OAAO,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IACD,eAAe,GAAG,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC;IACzC,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC;IACvC,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;IAC/B,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC3B,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC;IACrC,oDAAoD;IACpD,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;CAC3B;AAOD;;;;;;;;GAQG;AACH,MAAa,OAAO;IAOE;IAA8B;IALlC,iBAAiB,GAAG,IAAI,GAAG,EAAqB,CAAC;IACjD,4BAA4B,GAAG,IAAI,GAAG,EAAuC,CAAC;IAE9E,OAAO,CAAqB;IAE7C,YAAqB,WAAmB,EAAW,MAA0B,GAAG,EAAE,GAAG,CAAC;QAAjE,gBAAW,GAAX,WAAW,CAAQ;QAAW,QAAG,GAAH,GAAG,CAAgC;QACrF,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,qBAAqB,CAAC,IAAI,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,sBAAsB,CAAC,4BAA0C;QAEhE,sFAAsF;QAEtF,MAAM,KAAK,GAAG,CAAC,IAAa,EAAQ,EAAE;YACrC,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;gBAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;gBACjC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACpE,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACpC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;iBACzB;gBACD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;aACpF;YAED,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;gBAClF,IAAI,IAAI,CAAC,IAAI,EAAE;oBACd,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;oBACzB,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;oBACpE,IAAI,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;wBAC/C,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;qBACzB;oBACD,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;iBACrG;aACD;YAED,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC;mBAC9B,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;mBAC5B,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAChD;gBACD,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,4CAA4C;oBACzE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;oBACzB,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;oBACpE,IAAI,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;wBAC/C,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;qBACzB;oBACD,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;iBACrG;aACD;YAED,IAAI,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC;mBAC5B,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;mBAC5B,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAChD;gBACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE;oBACrD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;oBACvE,IAAI,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;wBAC/C,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;qBACzB;oBACD,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;iBACnH;aACD;YAED,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,cAAc,EAAE,EAAE;YAC/D,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAC5B,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aAC7B;SACD;QACD,IAAI,CAAC,GAAG,CAAC,6BAA6B,IAAI,CAAC,iBAAiB,CAAC,IAAI,wBAAwB,IAAI,CAAC,4BAA4B,CAAC,IAAI,EAAE,CAAC,CAAC;QAGnI,qCAAqC;QAErC,MAAM,YAAY,GAAG,CAAC,IAAe,EAAE,EAAE;YACxC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YACrG,IAAI,CAAC,aAAa,EAAE;gBACnB,oBAAoB;gBACpB,OAAO;aACP;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7G,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/B,2CAA2C;gBAC3C,OAAO;aACP;YAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,sCAAsC;gBACtC,OAAO;aACP;YAED,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;YAC1B,MAAM,GAAG,GAAG,GAAG,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAClE,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,EAAE;gBACZ,mDAAmD;gBACnD,OAAO;aACP;YACD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,YAAY,CAAC,IAAI,CAAC,CAAC;SACnB;QAED,uEAAuE;QACvE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;QAC/C,IAAI,sBAAsB,GAAG,KAAK,CAAC;QACnC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,SAAS,CAAC,gCAAgC,CAAC,IAAI,EAAE,CAAC,IAAY,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;gBAC5E,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,GAAG,EAAE;oBACR,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACd;qBAAM;oBACN,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC5B;gBAED,IAAI,4BAA4B,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC5E,sBAAsB,GAAG,IAAI,CAAC;iBAC9B;YACF,CAAC,CAAC,CAAC;SACH;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,UAAU,EAAE;YACrC,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,8BAA8B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SACvE;QACD,IAAI,sBAAsB,EAAE;YAC3B,MAAM,OAAO,GAAG,sIAAsI,CAAC;YACvJ,IAAI,CAAC,GAAG,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;SACzB;QAED,iDAAiD;QACjD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACnD,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAClC;QACD,IAAI,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;QAI7C,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;QAE9C,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,IAAU,EAAE,EAAE;YACnD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,EAAE;gBACX,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;aAClC;iBAAM;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACjB;QACF,CAAC,CAAC;QACF,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,GAAsB,EAAE,EAAE;YAChE,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE;gBACxB,OAAO,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,GAAG,OAAO,GAAG,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;gBAClE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK;gBAC1B,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM;aAC3B,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YAEnD,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;gBACzD,SAAS;aACT;YAED,MAAM,EAAE,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC/C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACxC,SAAS,MAAM,CAAC;iBAChB;gBAED,oDAAoD;gBACpD,uDAAuD;gBACvD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBACzB,OAAO,MAAM,EAAE;oBACd,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,6BAAqB,EAAE;wBACvD,SAAS,MAAM,CAAC;qBAChB;oBACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;iBACvB;gBAED,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtG,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;oBAC5B,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAC3B;aACD;SACD;QAED,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,4BAA4B,CAAC,MAAM,EAAE,EAAE;YAC9D,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;gBAC7C,SAAS;aACT;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC;YACrC,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC/F,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;oBAC5B,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAC3B;aACD;SACD;QAED,IAAI,CAAC,GAAG,CAAC,yBAAyB,WAAW,CAAC,IAAI,QAAQ,CAAC,CAAC;QAE5D,0CAA0C;QAC1C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC/C,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,cAAc,EAAE,EAAE;YAE/D,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAG,CAAC,kBAAkB,EAAE,CAAC;YAChF,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,aAAa,GAAG,OAAO,IAAI,IAAA,mBAAa,EAAC,UAAU,IAAI,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEpF,cAAc;YACd,IAAI,SAAyC,CAAC;YAE9C,IAAI,WAAmB,CAAC;YACxB,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,CAAC,KAAK,EAAE;gBACX,YAAY;gBACZ,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;aAEjC;iBAAM;gBACN,uBAAuB;gBACvB,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC7E,MAAM,cAAc,GAAG,IAAI,GAAG,EAAqB,CAAC;gBAEpD,gBAAgB;gBAChB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAEhD,IAAI,QAA0B,CAAC;gBAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;oBACzB,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE;wBAChD,EAAE;wBACF,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAAE;4BACzE,IAAI,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;4BACvE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;yBACpC;6BAAM;4BACN,SAAS;yBACT;qBACD;oBACD,QAAQ,GAAG,IAAI,CAAC;oBAChB,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACvF,UAAU,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;oBAEvD,cAAc;oBACd,MAAM,GAAG,GAAG,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAG5D,IAAI,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC5C,IAAI,CAAC,QAAQ,EAAE;wBACd,QAAQ,GAAG,EAAE,CAAC;wBACd,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;qBACvC;oBACD,QAAQ,CAAC,OAAO,CAAC;wBAChB,MAAM,EAAE,gBAAgB;wBACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;wBACvD,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;wBACxD,IAAI,EAAE,WAAW;qBACjB,EAAE;wBACF,MAAM,EAAE,gBAAgB;wBACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE;wBACrE,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;qBAC9E,CAAC,CAAC;iBACH;gBAED,oEAAoE;gBACpE,SAAS,GAAG,IAAI,+BAAkB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;gBACtG,SAAS,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBACjE,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,cAAc,EAAE;oBAC1C,IAAI,SAAS,GAAG,CAAC,CAAC;oBAClB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;wBAC/B,SAAS,CAAC,UAAU,CAAC;4BACpB,GAAG,OAAO;4BACV,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,SAAS,EAAE;yBACzF,CAAC,CAAC;wBACH,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;qBAChE;iBACD;gBAED,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;SAClF;QAED,IAAI,CAAC,GAAG,CAAC,SAAS,UAAU,GAAG,IAAI,UAAU,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC;IACf,CAAC;CACD;AAnSD,0BAmSC;AAED,gBAAgB;AAEhB,SAAS,WAAW,CAAC,IAAa,EAAE,IAAmB;IACtD,MAAM,SAAS,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,OAAO,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,KAAK,UAAU,IAAI;IAElB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC;IAE9F,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5D,IAAI,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;QAC9H,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QACpF,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxE,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,QAAQ,CAAC,SAAS,EAAE;YACvB,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,GAAG,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;SACtE;KACD;AACF,CAAC;AAED,IAAI,UAAU,KAAK,cAAI,CAAC,CAAC,CAAC,EAAE;IAC3B,IAAI,EAAE,CAAC;CACP"} \ No newline at end of file diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json index 13cf8a1be2a..8929f43ee4a 100644 --- a/build/lib/stylelint/vscode-known-variables.json +++ b/build/lib/stylelint/vscode-known-variables.json @@ -36,6 +36,8 @@ "--vscode-charts-purple", "--vscode-charts-red", "--vscode-charts-yellow", + "--vscode-chat-requestBackground", + "--vscode-chat-requestBorder", "--vscode-checkbox-background", "--vscode-checkbox-border", "--vscode-checkbox-foreground", @@ -49,6 +51,8 @@ "--vscode-commandCenter-foreground", "--vscode-commandCenter-inactiveBorder", "--vscode-commandCenter-inactiveForeground", + "--vscode-commentsView-resolvedIcon", + "--vscode-commentsView-unresolvedIcon", "--vscode-contrastActiveBorder", "--vscode-contrastBorder", "--vscode-debugConsole-errorForeground", @@ -92,9 +96,13 @@ "--vscode-diffEditor-insertedLineBackground", "--vscode-diffEditor-insertedTextBackground", "--vscode-diffEditor-insertedTextBorder", + "--vscode-diffEditor-move-border", "--vscode-diffEditor-removedLineBackground", "--vscode-diffEditor-removedTextBackground", "--vscode-diffEditor-removedTextBorder", + "--vscode-diffEditor-unchangedCodeBackground", + "--vscode-diffEditor-unchangedRegionBackground", + "--vscode-diffEditor-unchangedRegionForeground", "--vscode-diffEditorGutter-insertedLineBackground", "--vscode-diffEditorGutter-removedLineBackground", "--vscode-diffEditorOverview-insertedForeground", @@ -203,8 +211,18 @@ "--vscode-editorHoverWidget-foreground", "--vscode-editorHoverWidget-highlightForeground", "--vscode-editorHoverWidget-statusBarBackground", - "--vscode-editorIndentGuide-activeBackground", - "--vscode-editorIndentGuide-background", + "--vscode-editorIndentGuide-activeBackground1", + "--vscode-editorIndentGuide-activeBackground2", + "--vscode-editorIndentGuide-activeBackground3", + "--vscode-editorIndentGuide-activeBackground4", + "--vscode-editorIndentGuide-activeBackground5", + "--vscode-editorIndentGuide-activeBackground6", + "--vscode-editorIndentGuide-background1", + "--vscode-editorIndentGuide-background2", + "--vscode-editorIndentGuide-background3", + "--vscode-editorIndentGuide-background4", + "--vscode-editorIndentGuide-background5", + "--vscode-editorIndentGuide-background6", "--vscode-editorInfo-background", "--vscode-editorInfo-border", "--vscode-editorInfo-foreground", @@ -231,6 +249,8 @@ "--vscode-editorOverviewRuler-background", "--vscode-editorOverviewRuler-border", "--vscode-editorOverviewRuler-bracketMatchForeground", + "--vscode-editorOverviewRuler-commentForeground", + "--vscode-editorOverviewRuler-commentUnresolvedForeground", "--vscode-editorOverviewRuler-commonContentForeground", "--vscode-editorOverviewRuler-currentContentForeground", "--vscode-editorOverviewRuler-deletedForeground", @@ -287,6 +307,15 @@ "--vscode-focusBorder", "--vscode-foreground", "--vscode-icon-foreground", + "--vscode-inlineChat-background", + "--vscode-inlineChat-border", + "--vscode-inlineChat-regionHighlight", + "--vscode-inlineChat-shadow", + "--vscode-inlineChatDiff-inserted", + "--vscode-inlineChatInput-background", + "--vscode-inlineChatInput-border", + "--vscode-inlineChatInput-focusBorder", + "--vscode-inlineChatInput-placeholderForeground", "--vscode-input-background", "--vscode-input-border", "--vscode-input-foreground", @@ -304,15 +333,6 @@ "--vscode-inputValidation-warningBackground", "--vscode-inputValidation-warningBorder", "--vscode-inputValidation-warningForeground", - "--vscode-interactive-requestBackground", - "--vscode-interactive-requestBorder", - "--vscode-interactiveEditor-border", - "--vscode-interactiveEditor-regionHighlight", - "--vscode-interactiveEditor-shadow", - "--vscode-interactiveEditorInput-background", - "--vscode-interactiveEditorInput-border", - "--vscode-interactiveEditorInput-focusBorder", - "--vscode-interactiveEditorInput-placeholderForeground", "--vscode-keybindingLabel-background", "--vscode-keybindingLabel-border", "--vscode-keybindingLabel-bottomBorder", @@ -519,6 +539,8 @@ "--vscode-statusBar-noFolderBackground", "--vscode-statusBar-noFolderBorder", "--vscode-statusBar-noFolderForeground", + "--vscode-statusBar-offlineBackground", + "--vscode-statusBar-offlineForeground", "--vscode-statusBarItem-activeBackground", "--vscode-statusBarItem-compactHoverBackground", "--vscode-statusBarItem-errorBackground", @@ -675,6 +697,7 @@ "--background-light", "--dropdown-padding-bottom", "--dropdown-padding-top", + "--hover-maxWidth", "--insert-border-color", "--last-tab-margin-right", "--monaco-monospace-font", @@ -692,6 +715,9 @@ "--tab-border-top-color", "--tab-dirty-border-top-color", "--tabs-border-bottom-color", + "--tab-sizing-current-width", + "--tab-sizing-fixed-min-width", + "--tab-sizing-fixed-max-width", "--testMessageDecorationFontFamily", "--testMessageDecorationFontSize", "--title-border-bottom-color", @@ -701,6 +727,8 @@ "--vscode-editorCodeLens-fontSize", "--vscode-editorCodeLens-lineHeight", "--vscode-explorer-align-offset-margin-left", + "--vscode-inline-chat-cropped", + "--vscode-inline-chat-expanded", "--vscode-interactive-session-foreground", "--vscode-interactive-result-editor-background-color", "--vscode-repl-font-family", @@ -728,6 +756,7 @@ "--z-index-notebook-progress-bar", "--z-index-notebook-scrollbar", "--z-index-run-button-container", + "--z-index-notebook-sticky-scroll", "--zoom-factor" ] } diff --git a/build/lib/tsb/transpiler.js b/build/lib/tsb/transpiler.js index 0cf14b45469..0c704b66341 100644 --- a/build/lib/tsb/transpiler.js +++ b/build/lib/tsb/transpiler.js @@ -293,12 +293,15 @@ class SwcTranspiler { tsx: false, decorators: true }, - target: 'es2020', + target: 'es2022', loose: false, minify: { compress: false, mangle: false - } + }, + transform: { + useDefineForClassFields: false, + }, }, module: { type: 'amd', @@ -321,4 +324,4 @@ class SwcTranspiler { }; } exports.SwcTranspiler = SwcTranspiler; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["transpiler.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,iCAAiC;AACjC,iCAAiC;AACjC,+CAA+C;AAC/C,+BAA+B;AAC/B,qCAA+B;AAY/B,SAAS,SAAS,CAAC,KAAa,EAAE,OAA4B;IAE7D,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC,eAAe,EAAE,MAAM,KAAK,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE;QACpE,+CAA+C;QAC/C,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;KAC7G;IACD,MAAM,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC/C,OAAO;QACN,KAAK,EAAE,GAAG,CAAC,UAAU;QACrB,IAAI,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE;KAC3B,CAAC;AACH,CAAC;AAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;IAC1B,SAAS;IACT,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,SAAS,EAAE,CAAC,GAAiB,EAAE,EAAE;QAChE,MAAM,GAAG,GAAiB;YACzB,MAAM,EAAE,EAAE;YACV,WAAW,EAAE,EAAE;SACf,CAAC;QACF,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE;YAC/B,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1C,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC3B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC/B;QACD,OAAO,CAAC,UAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;CACH;AAED,MAAM,oBAAoB;IAEhB,iBAAiB,CAA2B;IAErD,YAAY,OAA6B,EAAE,cAAsB;QAOhE,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,EAAE,EAAE;YACjC,IAAI;gBAEH,gCAAgC;gBAChC,IAAI,GAAmB,EAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE;oBACpC,mEAAmE;oBACnE,OAAO,CAAC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;iBAChD;gBACD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACrC,IAAI,KAAK,EAAE;oBACV,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;oBACjC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC7B;gBACD,MAAM,OAAO,GAAmB,EAAG,CAAC,kBAAkB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/E,IAAI,KAAK,EAAE;oBACV,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;iBACxB;gBACD,OAAO,OAAO,CAAC;aAEf;YAAC,OAAO,GAAG,EAAE;gBACb,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBACvC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,MAAM,IAAI,GAAG,CAAC;aACd;QACF,CAAC,CAAC;IACH,CAAC;CACD;AAED,MAAM,eAAe;IAEZ,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;IAEf,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC;IAE7B,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACzC,QAAQ,CAAkG;IAC1G,UAAU,GAAa,EAAE,CAAC;IAElC,YAAY,SAAuC;QAElD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,GAAiB,EAAE,EAAE;YACzD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACnB,OAAO,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;gBAChD,OAAO;aACP;YAED,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;YAE5D,MAAM,QAAQ,GAAY,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAoB,EAAE,CAAC;YAEjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC3C,mDAAmD;gBACnD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC5B,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAEhC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;oBACnB,SAAS;iBACT;gBACD,IAAW,WAIV;gBAJD,WAAW,WAAW;oBACrB,2CAAO,CAAA;oBACP,yCAAM,CAAA;oBACN,mDAAW,CAAA;gBACZ,CAAC,EAJU,WAAW,KAAX,WAAW,QAIrB;gBACD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC9C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;wBAC5B,CAAC,4BAAoB,CAAC;gBAExB,+DAA+D;gBAC/D,iBAAiB;gBACjB,IAAI,SAAS,4BAAoB,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE;oBAC5D,SAAS;iBACT;gBAED,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,EAAE,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC;gBAC7D,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAErC,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;oBACvB,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;iBAC5B,CAAC,CAAC,CAAC;aACJ;YAED,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC1B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YAEtC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACpB,MAAM,CAAC,IAAI,CAAC,CAAC;aACb;iBAAM;gBACN,OAAO,CAAC,QAAQ,CAAC,CAAC;aAClB;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,SAAS;QACR,kNAAkN;QAClN,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,KAAc,EAAE,OAA4B;QAChD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;SACxB;QACD,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC/C,IAAI,CAAC,QAAQ,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAC9D,MAAM,GAAG,GAAiB;gBACzB,OAAO;gBACP,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAChD,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACJ,CAAC;;AASF,MAAa,aAAa;IAeP;IAEA;IAflB,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,cAAI,GAAE,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IAEzB,gBAAgB,CAAuB;IAGjD,SAAS,CAAyB;IAEjC,WAAW,GAAsB,EAAE,CAAC;IACpC,MAAM,GAAY,EAAE,CAAC;IACrB,QAAQ,GAAmB,EAAE,CAAC;IAEtC,YACC,KAA+C,EAC9B,QAA4B,EAC7C,cAAsB,EACL,QAA8B;QAF9B,aAAQ,GAAR,QAAQ,CAAoB;QAE5B,aAAQ,GAAR,QAAQ,CAAsB;QAE/C,KAAK,CAAC,WAAW,EAAE,YAAY,aAAa,CAAC,CAAC,mBAAmB,CAAC,CAAC;QACnE,IAAI,CAAC,gBAAgB,GAAG,IAAI,oBAAoB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,IAAI;QACT,4BAA4B;QAC5B,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QAEzB,uBAAuB;QACvB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC;IAGD,SAAS,CAAC,IAAW;QAEpB,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE;YACjC,0BAA0B;YAC1B,OAAO;SACP;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,MAAM,GAAG,aAAa,CAAC,CAAC,IAAI,CAAC,EAAE;YAClC,IAAI,CAAC,aAAa,EAAE,CAAC;SACrB;IACF,CAAC;IAEO,aAAa;QAEpB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,aAAa;YACb,OAAO;SACP;QAED,+BAA+B;QAC/B,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACzC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aAClG;SACD;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,wCAAwC;YACxC,OAAO;SACP;QAED,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAChC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,MAAM;aACN;YAED,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;gBAEjC,MAAM,OAAO,GAAG,GAAG,EAAE;oBACpB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;oBACrD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;wBACvB,OAAO;wBACP,OAAO,CAAC,SAAS,CAAC,CAAC;wBACnB,OAAO;qBACP;oBACD,wBAAwB;oBACxB,+BAA+B;oBAC/B,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;wBAC9E,IAAI,IAAI,CAAC,SAAS,EAAE;4BACnB,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;yBACnC;wBACD,OAAO,EAAE,CAAC;oBACX,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;wBACd,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACpB,CAAC,CAAC,CAAC;gBACJ,CAAC,CAAC;gBAEF,OAAO,EAAE,CAAC;YACX,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACxB;IACF,CAAC;;AAnGF,sCAoGC;AAED,SAAS,eAAe,CAAC,GAAW;IACnC,OAAO,GAAG;SACR,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;SAC5B,OAAO,CAAC,sCAAsC,EAAE,IAAI,CAAC;SACrD,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC;AACvB,CAAC;AAGD,MAAa,aAAa;IAQP;IACA;IAEA;IATlB,SAAS,CAAuC;IAE/B,gBAAgB,CAAuB;IAChD,KAAK,GAAmB,EAAE,CAAC;IAEnC,YACkB,MAAgD,EAChD,QAA4B,EAC7C,cAAsB,EACL,QAA8B;QAH9B,WAAM,GAAN,MAAM,CAA0C;QAChD,aAAQ,GAAR,QAAQ,CAAoB;QAE5B,aAAQ,GAAR,QAAQ,CAAsB;QAE/C,MAAM,CAAC,WAAW,EAAE,wCAAwC,CAAC,CAAC;QAC9D,IAAI,CAAC,gBAAgB,GAAG,IAAI,oBAAoB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,IAAI;QACT,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACtB,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,SAAS,CAAC,IAAW;QACpB,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE;YACjC,0BAA0B;YAC1B,OAAO;SACP;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEtB,IAAI,OAAO,GAAgB,aAAa,CAAC,SAAS,CAAC;QACnD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE;YACvD,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,KAAK,EAAE;gBACV,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC;aAClC;SACD;aAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE;YACnE,OAAO,GAAG,aAAa,CAAC,cAAc,CAAC;SACvC;QAED,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAE3D,+DAA+D;YAC/D,iBAAiB;YACjB,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAChE,OAAO;aACP;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC;YAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEnE,IAAI,CAAC,SAAU,CAAC,IAAI,KAAK,CAAC;gBACzB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;aAClC,CAAC,CAAC,CAAC;YAEJ,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,YAAY,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5E,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACd,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa;IAGL,MAAM,CAAU,SAAS,GAAgB;QAChD,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE;YACJ,MAAM,EAAE;gBACP,MAAM,EAAE,YAAY;gBACpB,GAAG,EAAE,KAAK;gBACV,UAAU,EAAE,IAAI;aAChB;YACD,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE;gBACP,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK;aACb;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE,KAAK;YACX,SAAS,EAAE,IAAI;SACf;QACD,MAAM,EAAE,KAAK;KACb,CAAC;IAEM,MAAM,CAAU,cAAc,GAAgB;QACrD,GAAG,IAAI,CAAC,SAAS;QACjB,MAAM,EAAE;YACP,IAAI,EAAE,UAAU;YAChB,aAAa,EAAE,MAAM;SACrB;KACD,CAAC;IAEM,MAAM,CAAU,SAAS,GAAgB;QAChD,GAAG,IAAI,CAAC,SAAS;QACjB,MAAM,EAAE;YACP,IAAI,EAAE,KAAK;SACX;KACD,CAAC;;AAxGH,sCAyGC"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["transpiler.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,iCAAiC;AACjC,iCAAiC;AACjC,+CAA+C;AAC/C,+BAA+B;AAC/B,qCAA+B;AAY/B,SAAS,SAAS,CAAC,KAAa,EAAE,OAA4B;IAE7D,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC,eAAe,EAAE,MAAM,KAAK,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE;QACpE,+CAA+C;QAC/C,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;KAC7G;IACD,MAAM,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC/C,OAAO;QACN,KAAK,EAAE,GAAG,CAAC,UAAU;QACrB,IAAI,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE;KAC3B,CAAC;AACH,CAAC;AAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;IAC1B,SAAS;IACT,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,SAAS,EAAE,CAAC,GAAiB,EAAE,EAAE;QAChE,MAAM,GAAG,GAAiB;YACzB,MAAM,EAAE,EAAE;YACV,WAAW,EAAE,EAAE;SACf,CAAC;QACF,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE;YAC/B,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1C,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC3B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC/B;QACD,OAAO,CAAC,UAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;CACH;AAED,MAAM,oBAAoB;IAEhB,iBAAiB,CAA2B;IAErD,YAAY,OAA6B,EAAE,cAAsB;QAOhE,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,EAAE,EAAE;YACjC,IAAI;gBAEH,gCAAgC;gBAChC,IAAI,GAAmB,EAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE;oBACpC,mEAAmE;oBACnE,OAAO,CAAC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;iBAChD;gBACD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACrC,IAAI,KAAK,EAAE;oBACV,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;oBACjC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC7B;gBACD,MAAM,OAAO,GAAmB,EAAG,CAAC,kBAAkB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/E,IAAI,KAAK,EAAE;oBACV,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;iBACxB;gBACD,OAAO,OAAO,CAAC;aAEf;YAAC,OAAO,GAAG,EAAE;gBACb,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBACvC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,MAAM,IAAI,GAAG,CAAC;aACd;QACF,CAAC,CAAC;IACH,CAAC;CACD;AAED,MAAM,eAAe;IAEZ,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;IAEf,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC;IAE7B,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACzC,QAAQ,CAAkG;IAC1G,UAAU,GAAa,EAAE,CAAC;IAElC,YAAY,SAAuC;QAElD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,GAAiB,EAAE,EAAE;YACzD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACnB,OAAO,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;gBAChD,OAAO;aACP;YAED,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;YAE5D,MAAM,QAAQ,GAAY,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAoB,EAAE,CAAC;YAEjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC3C,mDAAmD;gBACnD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC5B,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAEhC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;oBACnB,SAAS;iBACT;gBACD,IAAW,WAIV;gBAJD,WAAW,WAAW;oBACrB,2CAAO,CAAA;oBACP,yCAAM,CAAA;oBACN,mDAAW,CAAA;gBACZ,CAAC,EAJU,WAAW,KAAX,WAAW,QAIrB;gBACD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC9C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;wBAC5B,CAAC,4BAAoB,CAAC;gBAExB,+DAA+D;gBAC/D,iBAAiB;gBACjB,IAAI,SAAS,4BAAoB,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE;oBAC5D,SAAS;iBACT;gBAED,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,EAAE,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC;gBAC7D,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAErC,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;oBACvB,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;iBAC5B,CAAC,CAAC,CAAC;aACJ;YAED,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC1B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YAEtC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACpB,MAAM,CAAC,IAAI,CAAC,CAAC;aACb;iBAAM;gBACN,OAAO,CAAC,QAAQ,CAAC,CAAC;aAClB;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,SAAS;QACR,kNAAkN;QAClN,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,KAAc,EAAE,OAA4B;QAChD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;SACxB;QACD,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC/C,IAAI,CAAC,QAAQ,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAC9D,MAAM,GAAG,GAAiB;gBACzB,OAAO;gBACP,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAChD,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACJ,CAAC;;AASF,MAAa,aAAa;IAeP;IAEA;IAflB,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,cAAI,GAAE,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IAEzB,gBAAgB,CAAuB;IAGjD,SAAS,CAAyB;IAEjC,WAAW,GAAsB,EAAE,CAAC;IACpC,MAAM,GAAY,EAAE,CAAC;IACrB,QAAQ,GAAmB,EAAE,CAAC;IAEtC,YACC,KAA+C,EAC9B,QAA4B,EAC7C,cAAsB,EACL,QAA8B;QAF9B,aAAQ,GAAR,QAAQ,CAAoB;QAE5B,aAAQ,GAAR,QAAQ,CAAsB;QAE/C,KAAK,CAAC,WAAW,EAAE,YAAY,aAAa,CAAC,CAAC,mBAAmB,CAAC,CAAC;QACnE,IAAI,CAAC,gBAAgB,GAAG,IAAI,oBAAoB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,IAAI;QACT,4BAA4B;QAC5B,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QAEzB,uBAAuB;QACvB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC;IAGD,SAAS,CAAC,IAAW;QAEpB,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE;YACjC,0BAA0B;YAC1B,OAAO;SACP;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,MAAM,GAAG,aAAa,CAAC,CAAC,IAAI,CAAC,EAAE;YAClC,IAAI,CAAC,aAAa,EAAE,CAAC;SACrB;IACF,CAAC;IAEO,aAAa;QAEpB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,aAAa;YACb,OAAO;SACP;QAED,+BAA+B;QAC/B,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACzC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aAClG;SACD;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,wCAAwC;YACxC,OAAO;SACP;QAED,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAChC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,MAAM;aACN;YAED,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;gBAEjC,MAAM,OAAO,GAAG,GAAG,EAAE;oBACpB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;oBACrD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;wBACvB,OAAO;wBACP,OAAO,CAAC,SAAS,CAAC,CAAC;wBACnB,OAAO;qBACP;oBACD,wBAAwB;oBACxB,+BAA+B;oBAC/B,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;wBAC9E,IAAI,IAAI,CAAC,SAAS,EAAE;4BACnB,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;yBACnC;wBACD,OAAO,EAAE,CAAC;oBACX,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;wBACd,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACpB,CAAC,CAAC,CAAC;gBACJ,CAAC,CAAC;gBAEF,OAAO,EAAE,CAAC;YACX,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACxB;IACF,CAAC;;AAnGF,sCAoGC;AAED,SAAS,eAAe,CAAC,GAAW;IACnC,OAAO,GAAG;SACR,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;SAC5B,OAAO,CAAC,sCAAsC,EAAE,IAAI,CAAC;SACrD,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC;AACvB,CAAC;AAGD,MAAa,aAAa;IAQP;IACA;IAEA;IATlB,SAAS,CAAuC;IAE/B,gBAAgB,CAAuB;IAChD,KAAK,GAAmB,EAAE,CAAC;IAEnC,YACkB,MAAgD,EAChD,QAA4B,EAC7C,cAAsB,EACL,QAA8B;QAH9B,WAAM,GAAN,MAAM,CAA0C;QAChD,aAAQ,GAAR,QAAQ,CAAoB;QAE5B,aAAQ,GAAR,QAAQ,CAAsB;QAE/C,MAAM,CAAC,WAAW,EAAE,wCAAwC,CAAC,CAAC;QAC9D,IAAI,CAAC,gBAAgB,GAAG,IAAI,oBAAoB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,IAAI;QACT,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACtB,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,SAAS,CAAC,IAAW;QACpB,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE;YACjC,0BAA0B;YAC1B,OAAO;SACP;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEtB,IAAI,OAAO,GAAgB,aAAa,CAAC,SAAS,CAAC;QACnD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE;YACvD,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,KAAK,EAAE;gBACV,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC;aAClC;SACD;aAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE;YACnE,OAAO,GAAG,aAAa,CAAC,cAAc,CAAC;SACvC;QAED,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAE3D,+DAA+D;YAC/D,iBAAiB;YACjB,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAChE,OAAO;aACP;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC;YAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEnE,IAAI,CAAC,SAAU,CAAC,IAAI,KAAK,CAAC;gBACzB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;aAClC,CAAC,CAAC,CAAC;YAEJ,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,YAAY,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5E,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACd,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa;IAGL,MAAM,CAAU,SAAS,GAAgB;QAChD,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE;YACJ,MAAM,EAAE;gBACP,MAAM,EAAE,YAAY;gBACpB,GAAG,EAAE,KAAK;gBACV,UAAU,EAAE,IAAI;aAChB;YACD,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE;gBACP,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK;aACb;YACD,SAAS,EAAE;gBACV,uBAAuB,EAAE,KAAK;aAC9B;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE,KAAK;YACX,SAAS,EAAE,IAAI;SACf;QACD,MAAM,EAAE,KAAK;KACb,CAAC;IAEM,MAAM,CAAU,cAAc,GAAgB;QACrD,GAAG,IAAI,CAAC,SAAS;QACjB,MAAM,EAAE;YACP,IAAI,EAAE,UAAU;YAChB,aAAa,EAAE,MAAM;SACrB;KACD,CAAC;IAEM,MAAM,CAAU,SAAS,GAAgB;QAChD,GAAG,IAAI,CAAC,SAAS;QACjB,MAAM,EAAE;YACP,IAAI,EAAE,KAAK;SACX;KACD,CAAC;;AA3GH,sCA4GC"} \ No newline at end of file diff --git a/build/lib/tsb/transpiler.ts b/build/lib/tsb/transpiler.ts index a82cbaef890..a546ea63316 100644 --- a/build/lib/tsb/transpiler.ts +++ b/build/lib/tsb/transpiler.ts @@ -376,12 +376,15 @@ export class SwcTranspiler implements ITranspiler { tsx: false, decorators: true }, - target: 'es2020', + target: 'es2022', loose: false, minify: { compress: false, mangle: false - } + }, + transform: { + useDefineForClassFields: false, + }, }, module: { type: 'amd', diff --git a/build/lib/util.js b/build/lib/util.js index 9ac562f4640..b06cd43dc29 100644 --- a/build/lib/util.js +++ b/build/lib/util.js @@ -55,7 +55,7 @@ function incremental(streamProvider, initial, supportsCancellation) { return es.duplex(input, output); } exports.incremental = incremental; -function debounce(task) { +function debounce(task, duration = 500) { const input = es.through(); const output = es.through(); let state = 'idle'; @@ -72,7 +72,7 @@ function debounce(task) { .pipe(output); }; run(); - const eventuallyRun = _debounce(() => run(), 500); + const eventuallyRun = _debounce(() => run(), duration); input.on('data', () => { if (state === 'idle') { eventuallyRun(); @@ -168,7 +168,7 @@ function loadSourcemaps() { version: '3', names: [], mappings: '', - sources: [f.relative], + sources: [f.relative.replace(/\\/g, '/')], sourcesContent: [contents] }; cb(undefined, f); @@ -314,14 +314,20 @@ function streamToPromise(stream) { exports.streamToPromise = streamToPromise; function getElectronVersion() { const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8'); - const target = /^target "(.*)"$/m.exec(yarnrc)[1]; - return target; + const electronVersion = /^target "(.*)"$/m.exec(yarnrc)[1]; + const msBuildId = /^ms_build_id "(.*)"$/m.exec(yarnrc)[1]; + return { electronVersion, msBuildId }; } exports.getElectronVersion = getElectronVersion; function acquireWebNodePaths() { const root = path.join(__dirname, '..', '..'); const webPackageJSON = path.join(root, '/remote/web', 'package.json'); const webPackages = JSON.parse(fs.readFileSync(webPackageJSON, 'utf8')).dependencies; + const distroWebPackageJson = path.join(root, '.build/distro/npm/remote/web/package.json'); + if (fs.existsSync(distroWebPackageJson)) { + const distroWebPackages = JSON.parse(fs.readFileSync(distroWebPackageJson, 'utf8')).dependencies; + Object.assign(webPackages, distroWebPackages); + } const nodePaths = {}; for (const key of Object.keys(webPackages)) { const packageJSON = path.join(root, 'node_modules', key, 'package.json'); @@ -400,4 +406,4 @@ function buildWebNodePaths(outDir) { return result; } exports.buildWebNodePaths = buildWebNodePaths; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["util.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,mCAAmC;AACnC,sCAAuC;AACvC,uCAAuC;AACvC,sCAAsC;AACtC,6BAA6B;AAC7B,yBAAyB;AACzB,kCAAkC;AAClC,mCAAmC;AAGnC,6BAAoC;AACpC,gDAAgD;AAEhD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;AAMnD,MAAM,mBAAmB,GAAuB,EAAE,uBAAuB,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;AAMzF,SAAgB,WAAW,CAAC,cAA+B,EAAE,OAA+B,EAAE,oBAA8B;IAC3H,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC5B,IAAI,KAAK,GAAG,MAAM,CAAC;IACnB,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEjC,MAAM,KAAK,GAAmC,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,uBAAuB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;IAEpJ,MAAM,GAAG,GAAG,CAAC,KAA6B,EAAE,aAAsB,EAAE,EAAE;QACrE,KAAK,GAAG,SAAS,CAAC;QAElB,MAAM,MAAM,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAEtH,KAAK;aACH,IAAI,CAAC,MAAM,CAAC;aACZ,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE;YAChC,KAAK,GAAG,MAAM,CAAC;YACf,aAAa,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;aACF,IAAI,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,IAAI,OAAO,EAAE;QACZ,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;KACpB;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,EAAE;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAElC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO;SACP;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC7B,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC,EAAE,GAAG,CAAC,CAAC;IAER,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAM,EAAE,EAAE;QAC3B,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnB,IAAI,KAAK,KAAK,MAAM,EAAE;YACrB,aAAa,EAAE,CAAC;SAChB;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AA/CD,kCA+CC;AAED,SAAgB,QAAQ,CAAC,IAAkC;IAC1D,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC5B,IAAI,KAAK,GAAG,MAAM,CAAC;IAEnB,MAAM,GAAG,GAAG,GAAG,EAAE;QAChB,KAAK,GAAG,SAAS,CAAC;QAElB,IAAI,EAAE;aACJ,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE;YAChC,MAAM,cAAc,GAAG,KAAK,KAAK,OAAO,CAAC;YACzC,KAAK,GAAG,MAAM,CAAC;YAEf,IAAI,cAAc,EAAE;gBACnB,aAAa,EAAE,CAAC;aAChB;QACF,CAAC,CAAC,CAAC;aACF,IAAI,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,GAAG,EAAE,CAAC;IAEN,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;IAElD,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;QACrB,IAAI,KAAK,KAAK,MAAM,EAAE;YACrB,aAAa,EAAE,CAAC;SAChB;aAAM;YACN,KAAK,GAAG,OAAO,CAAC;SAChB;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAjCD,4BAiCC;AAED,SAAgB,4BAA4B;IAC3C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACpC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC;KACpB;IAED,OAAO,EAAE,CAAC,OAAO,CAAuB,CAAC,CAAC,EAAE;QAC3C,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;YACzD,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;SACpB;QAED,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;AACJ,CAAC;AAZD,oEAYC;AAED,SAAgB,gBAAgB,CAAC,OAA2B;IAC3D,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAuB,CAAC,CAAC,EAAE;QACnD,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;YACZ,CAAC,CAAC,IAAI,GAAG,EAAE,MAAM,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC,EAAS,CAAC;SAC9C;QACD,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC;QACjC,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,EAAE;QACb,OAAO,MAAM,CAAC;KACd;IAED,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEvB,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AArBD,4CAqBC;AAED,SAAgB,SAAS,CAAC,QAAgB;IACzC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAEjD,IAAI,KAAK,EAAE;QACV,QAAQ,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;KACzD;IAED,OAAO,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACjD,CAAC;AARD,8BAQC;AAED,SAAgB,eAAe;IAC9B,OAAO,EAAE,CAAC,OAAO,CAAmC,CAAC,CAAC,EAAE;QACvD,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;YACrB,OAAO,CAAC,CAAC;SACT;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAND,0CAMC;AAED,SAAgB,gBAAgB,CAAC,QAAgB;IAChD,MAAM,KAAK,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC;SAC7C,KAAK,CAAC,QAAQ,CAAC;SACf,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SACxB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3C,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;IAChG,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,mBAAmB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAExG,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CACtB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,EACxC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAC7B,CAAC;IAEF,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAhBD,4CAgBC;AAMD,SAAgB,cAAc;IAC7B,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,EAAE,CAAC,GAAG,CAA2C,CAAC,CAAC,EAAE,EAAE,EAA6B,EAAE;QAC3F,IAAI,CAAC,CAAC,SAAS,EAAE;YAChB,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACjB,OAAO;SACP;QAED,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE;YAChB,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACjB,OAAO;SACP;QAED,MAAM,QAAQ,GAAY,CAAC,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,+BAA+B,CAAC;QAC5C,IAAI,SAAS,GAA2B,IAAI,CAAC;QAC7C,IAAI,KAAK,GAA2B,IAAI,CAAC;QAEzC,OAAO,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAClC,SAAS,GAAG,KAAK,CAAC;SAClB;QAED,IAAI,CAAC,SAAS,EAAE;YACf,CAAC,CAAC,SAAS,GAAG;gBACb,OAAO,EAAE,GAAG;gBACZ,KAAK,EAAE,EAAE;gBACT,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;gBACrB,cAAc,EAAE,CAAC,QAAQ,CAAC;aAC1B,CAAC;YAEF,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACjB,OAAO;SACP;QAED,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,+BAA+B,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAExF,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;YACpF,IAAI,GAAG,EAAE;gBAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;aAAE;YAE5B,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACnC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAjDD,wCAiDC;AAED,SAAgB,qBAAqB;IACpC,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,EAAE,CAAC,OAAO,CAAuB,CAAC,CAAC,EAAE;QAC1C,MAAM,QAAQ,GAAY,CAAC,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACvD,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kCAAkC,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3F,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAXD,sDAWC;AAED,8GAA8G;AAC9G,SAAgB,GAAG,CAAC,IAA2C,EAAE,MAA8B,EAAE,UAAkC,EAAE,CAAC,OAAO,EAAE;IAC9I,IAAI,OAAO,IAAI,KAAK,SAAS,EAAE;QAC9B,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;KAC/B;IAED,OAAO,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAC7C,CAAC;AAND,kBAMC;AAED,4FAA4F;AAC5F,SAAgB,sBAAsB;IACrC,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,EAAE,CAAC,OAAO,CAAuB,CAAC,CAAC,EAAE;QAC1C,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,YAAY,MAAM,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,IAAI,mBAAmB,CAAC,CAAC;SAC1D;QAED,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAA,mBAAa,EAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAClG,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAdD,wDAcC;AAED,SAAgB,uBAAuB,CAAC,oBAA4B;IACnE,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,EAAE,CAAC,OAAO,CAAuB,CAAC,CAAC,EAAE;QAC1C,MAAM,QAAQ,GAAY,CAAC,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,wBAAwB,oBAAoB,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC;QAC9G,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAC,CAAC;QACpF,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAZD,0DAYC;AAED,SAAgB,MAAM,CAAC,GAAW;IACjC,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC/C,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,MAAM,KAAK,GAAG,GAAG,EAAE;YAClB,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC,GAAQ,EAAE,EAAE;gBAC9C,IAAI,CAAC,GAAG,EAAE;oBACT,OAAO,CAAC,EAAE,CAAC;iBACX;gBAED,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,EAAE,OAAO,GAAG,CAAC,EAAE;oBAC9C,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;iBACrC;gBAED,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;YACf,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,KAAK,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,QAAQ,GAAG,SAAS,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;IAC9D,OAAO,MAAM,CAAC;AACf,CAAC;AAvBD,wBAuBC;AAED,SAAS,SAAS,CAAC,OAAe,EAAE,OAAe,EAAE,MAAgB;IACpE,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACjE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;QAC5B,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;YACxB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;SAC9E;aAAM;YACN,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;SACxC;KACD;AACF,CAAC;AAED,SAAgB,OAAO,CAAC,OAAe;IACtC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IAC/B,OAAO,MAAM,CAAC;AACf,CAAC;AAJD,0BAIC;AAED,SAAgB,SAAS,CAAC,OAAe;IACxC,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC3B,OAAO;KACP;IACD,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACjC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC;AAND,8BAMC;AAED,SAAgB,MAAM,CAAC,KAAa;IACnC,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE;QACjB,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACJ,CAAC;AALD,wBAKC;AAMD,SAAgB,MAAM,CAAC,EAA0B;IAChD,MAAM,MAAM,GAAsB,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI;QAC1D,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE;YACb,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACxB;aAAM;YACN,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;IACF,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC9B,OAAO,MAAM,CAAC;AACf,CAAC;AAXD,wBAWC;AAED,SAAgB,qBAAqB,CAAC,UAAkB;IACvD,MAAM,WAAW,GAAG,qBAAqB,CAAC;IAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC5C,IAAI,CAAC,KAAK,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,4CAA4C,GAAG,UAAU,CAAC,CAAC;KAC3E;IAED,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC7F,CAAC;AARD,sDAQC;AAED,SAAgB,eAAe,CAAC,MAA8B;IAC7D,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACJ,CAAC;AALD,0CAKC;AAED,SAAgB,kBAAkB;IACjC,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAE,CAAC,CAAC,CAAC,CAAC;IACnD,OAAO,MAAM,CAAC;AACf,CAAC;AAJD,gDAIC;AAED,SAAgB,mBAAmB;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC;IACrF,MAAM,SAAS,GAA8B,EAAE,CAAC;IAChD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;QAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;QACzE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QACrE,uDAAuD;QACvD,IAAI,UAAU,GAAW,OAAO,WAAW,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;QAE1G,qGAAqG;QACrG,IAAI,CAAC,UAAU,EAAE;YAChB,+GAA+G;YAC/G,IAAI,GAAG,KAAK,WAAW,EAAE;gBACxB,OAAO,CAAC,IAAI,CAAC,sBAAsB,GAAG,kBAAkB,GAAG,SAAS,CAAC,CAAC;aACtE;YAED,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;SAClC;QAED,iEAAiE;QACjE,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAChC,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACrC;aAAM,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACtC,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACrC;QAED,2CAA2C;QAC3C,IAAI,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACxC,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAE9D,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE;gBACvE,UAAU,GAAG,aAAa,CAAC;aAC3B;SACD;QAED,SAAS,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;KAC5B;IAED,0EAA0E;IAC1E,oDAAoD;IACpD,oEAAoE;IACpE,iFAAiF;IACjF,SAAS,CAAC,4BAA4B,CAAC,GAAG,qCAAqC,CAAC;IAChF,SAAS,CAAC,sCAAsC,CAAC,GAAG,2CAA2C,CAAC;IAChG,SAAS,CAAC,wCAAwC,CAAC,GAAG,4CAA4C,CAAC;IACnG,OAAO,SAAS,CAAC;AAClB,CAAC;AAhDD,kDAgDC;AAQD,SAAgB,0BAA0B,CAAC,WAAoB,EAAE,MAAe,EAAE,OAAgB;IACjG,IAAI,CAAC,WAAW,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE;QACxC,OAAO,SAAS,CAAC;KACjB;IACD,WAAW,GAAG,WAAW,GAAG,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;IACpD,MAAM,SAAS,GAAG,mBAAmB,EAAE,CAAC;IACxC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAU,GAAG,EAAE,CAAC;QAC1C,SAAS,CAAC,GAAG,CAAC,GAAG,mBAAmB,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;IAC7D,CAAC,CAAC,CAAC;IACH,MAAM,oBAAoB,GAAwB;QACjD,OAAO,EAAE,GAAG,WAAW,MAAM;QAC7B,WAAW,EAAE,IAAI;QACjB,KAAK,EAAE,SAAS;KAChB,CAAC;IACF,OAAO,oBAAoB,CAAC;AAC7B,CAAC;AAfD,gEAeC;AAED,SAAgB,iBAAiB,CAAC,MAAc;IAC/C,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,mBAAmB,EAAE,CAAC;QACxC,wCAAwC;QACxC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACnD,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,MAAM,8BAA8B,GAAG;;;;;qEAK4B,CAAC;QACpE,MAAM,YAAY,GAAG,GAAG,8BAA8B,4BAA4B,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC;QACxH,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,oBAAoB,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QACtF,OAAO,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,QAAQ,GAAG,sBAAsB,CAAC;IACzC,OAAO,MAAM,CAAC;AACf,CAAC;AAnBD,8CAmBC"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["util.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,mCAAmC;AACnC,sCAAuC;AACvC,uCAAuC;AACvC,sCAAsC;AACtC,6BAA6B;AAC7B,yBAAyB;AACzB,kCAAkC;AAClC,mCAAmC;AAGnC,6BAAoC;AACpC,gDAAgD;AAEhD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;AAMnD,MAAM,mBAAmB,GAAuB,EAAE,uBAAuB,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;AAMzF,SAAgB,WAAW,CAAC,cAA+B,EAAE,OAA+B,EAAE,oBAA8B;IAC3H,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC5B,IAAI,KAAK,GAAG,MAAM,CAAC;IACnB,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEjC,MAAM,KAAK,GAAmC,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,uBAAuB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;IAEpJ,MAAM,GAAG,GAAG,CAAC,KAA6B,EAAE,aAAsB,EAAE,EAAE;QACrE,KAAK,GAAG,SAAS,CAAC;QAElB,MAAM,MAAM,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAEtH,KAAK;aACH,IAAI,CAAC,MAAM,CAAC;aACZ,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE;YAChC,KAAK,GAAG,MAAM,CAAC;YACf,aAAa,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;aACF,IAAI,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,IAAI,OAAO,EAAE;QACZ,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;KACpB;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,EAAE;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAElC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO;SACP;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC7B,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC,EAAE,GAAG,CAAC,CAAC;IAER,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAM,EAAE,EAAE;QAC3B,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnB,IAAI,KAAK,KAAK,MAAM,EAAE;YACrB,aAAa,EAAE,CAAC;SAChB;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AA/CD,kCA+CC;AAED,SAAgB,QAAQ,CAAC,IAAkC,EAAE,QAAQ,GAAG,GAAG;IAC1E,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC5B,IAAI,KAAK,GAAG,MAAM,CAAC;IAEnB,MAAM,GAAG,GAAG,GAAG,EAAE;QAChB,KAAK,GAAG,SAAS,CAAC;QAElB,IAAI,EAAE;aACJ,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE;YAChC,MAAM,cAAc,GAAG,KAAK,KAAK,OAAO,CAAC;YACzC,KAAK,GAAG,MAAM,CAAC;YAEf,IAAI,cAAc,EAAE;gBACnB,aAAa,EAAE,CAAC;aAChB;QACF,CAAC,CAAC,CAAC;aACF,IAAI,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,GAAG,EAAE,CAAC;IAEN,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;IAEvD,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;QACrB,IAAI,KAAK,KAAK,MAAM,EAAE;YACrB,aAAa,EAAE,CAAC;SAChB;aAAM;YACN,KAAK,GAAG,OAAO,CAAC;SAChB;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAjCD,4BAiCC;AAED,SAAgB,4BAA4B;IAC3C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACpC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC;KACpB;IAED,OAAO,EAAE,CAAC,OAAO,CAAuB,CAAC,CAAC,EAAE;QAC3C,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;YACzD,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;SACpB;QAED,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;AACJ,CAAC;AAZD,oEAYC;AAED,SAAgB,gBAAgB,CAAC,OAA2B;IAC3D,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAuB,CAAC,CAAC,EAAE;QACnD,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;YACZ,CAAC,CAAC,IAAI,GAAG,EAAE,MAAM,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC,EAAS,CAAC;SAC9C;QACD,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC;QACjC,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,EAAE;QACb,OAAO,MAAM,CAAC;KACd;IAED,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEvB,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AArBD,4CAqBC;AAED,SAAgB,SAAS,CAAC,QAAgB;IACzC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAEjD,IAAI,KAAK,EAAE;QACV,QAAQ,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;KACzD;IAED,OAAO,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACjD,CAAC;AARD,8BAQC;AAED,SAAgB,eAAe;IAC9B,OAAO,EAAE,CAAC,OAAO,CAAmC,CAAC,CAAC,EAAE;QACvD,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;YACrB,OAAO,CAAC,CAAC;SACT;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAND,0CAMC;AAED,SAAgB,gBAAgB,CAAC,QAAgB;IAChD,MAAM,KAAK,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC;SAC7C,KAAK,CAAC,QAAQ,CAAC;SACf,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SACxB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3C,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;IAChG,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,mBAAmB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAExG,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CACtB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,EACxC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAC7B,CAAC;IAEF,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAhBD,4CAgBC;AAMD,SAAgB,cAAc;IAC7B,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,EAAE,CAAC,GAAG,CAA2C,CAAC,CAAC,EAAE,EAAE,EAA6B,EAAE;QAC3F,IAAI,CAAC,CAAC,SAAS,EAAE;YAChB,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACjB,OAAO;SACP;QAED,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE;YAChB,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACjB,OAAO;SACP;QAED,MAAM,QAAQ,GAAY,CAAC,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,+BAA+B,CAAC;QAC5C,IAAI,SAAS,GAA2B,IAAI,CAAC;QAC7C,IAAI,KAAK,GAA2B,IAAI,CAAC;QAEzC,OAAO,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAClC,SAAS,GAAG,KAAK,CAAC;SAClB;QAED,IAAI,CAAC,SAAS,EAAE;YACf,CAAC,CAAC,SAAS,GAAG;gBACb,OAAO,EAAE,GAAG;gBACZ,KAAK,EAAE,EAAE;gBACT,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;gBACzC,cAAc,EAAE,CAAC,QAAQ,CAAC;aAC1B,CAAC;YAEF,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACjB,OAAO;SACP;QAED,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,+BAA+B,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAExF,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;YACpF,IAAI,GAAG,EAAE;gBAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;aAAE;YAE5B,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACnC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAjDD,wCAiDC;AAED,SAAgB,qBAAqB;IACpC,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,EAAE,CAAC,OAAO,CAAuB,CAAC,CAAC,EAAE;QAC1C,MAAM,QAAQ,GAAY,CAAC,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACvD,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kCAAkC,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3F,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAXD,sDAWC;AAED,8GAA8G;AAC9G,SAAgB,GAAG,CAAC,IAA2C,EAAE,MAA8B,EAAE,UAAkC,EAAE,CAAC,OAAO,EAAE;IAC9I,IAAI,OAAO,IAAI,KAAK,SAAS,EAAE;QAC9B,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;KAC/B;IAED,OAAO,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAC7C,CAAC;AAND,kBAMC;AAED,4FAA4F;AAC5F,SAAgB,sBAAsB;IACrC,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,EAAE,CAAC,OAAO,CAAuB,CAAC,CAAC,EAAE;QAC1C,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,YAAY,MAAM,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,IAAI,mBAAmB,CAAC,CAAC;SAC1D;QAED,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAA,mBAAa,EAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAClG,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAdD,wDAcC;AAED,SAAgB,uBAAuB,CAAC,oBAA4B;IACnE,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAE3B,MAAM,MAAM,GAAG,KAAK;SAClB,IAAI,CAAC,EAAE,CAAC,OAAO,CAAuB,CAAC,CAAC,EAAE;QAC1C,MAAM,QAAQ,GAAY,CAAC,CAAC,QAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,wBAAwB,oBAAoB,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC;QAC9G,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAC,CAAC;QACpF,OAAO,CAAC,CAAC;IACV,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAZD,0DAYC;AAED,SAAgB,MAAM,CAAC,GAAW;IACjC,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC/C,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,MAAM,KAAK,GAAG,GAAG,EAAE;YAClB,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC,GAAQ,EAAE,EAAE;gBAC9C,IAAI,CAAC,GAAG,EAAE;oBACT,OAAO,CAAC,EAAE,CAAC;iBACX;gBAED,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,EAAE,OAAO,GAAG,CAAC,EAAE;oBAC9C,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;iBACrC;gBAED,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;YACf,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,KAAK,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,QAAQ,GAAG,SAAS,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;IAC9D,OAAO,MAAM,CAAC;AACf,CAAC;AAvBD,wBAuBC;AAED,SAAS,SAAS,CAAC,OAAe,EAAE,OAAe,EAAE,MAAgB;IACpE,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACjE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;QAC5B,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;YACxB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;SAC9E;aAAM;YACN,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;SACxC;KACD;AACF,CAAC;AAED,SAAgB,OAAO,CAAC,OAAe;IACtC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IAC/B,OAAO,MAAM,CAAC;AACf,CAAC;AAJD,0BAIC;AAED,SAAgB,SAAS,CAAC,OAAe;IACxC,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC3B,OAAO;KACP;IACD,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACjC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC;AAND,8BAMC;AAED,SAAgB,MAAM,CAAC,KAAa;IACnC,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE;QACjB,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACJ,CAAC;AALD,wBAKC;AAMD,SAAgB,MAAM,CAAC,EAA0B;IAChD,MAAM,MAAM,GAAsB,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI;QAC1D,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE;YACb,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACxB;aAAM;YACN,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;IACF,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC9B,OAAO,MAAM,CAAC;AACf,CAAC;AAXD,wBAWC;AAED,SAAgB,qBAAqB,CAAC,UAAkB;IACvD,MAAM,WAAW,GAAG,qBAAqB,CAAC;IAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC5C,IAAI,CAAC,KAAK,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,4CAA4C,GAAG,UAAU,CAAC,CAAC;KAC3E;IAED,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC7F,CAAC;AARD,sDAQC;AAED,SAAgB,eAAe,CAAC,MAA8B;IAC7D,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACJ,CAAC;AALD,0CAKC;AAED,SAAgB,kBAAkB;IACjC,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;IACnE,MAAM,eAAe,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAE,CAAC,CAAC,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAE,CAAC,CAAC,CAAC,CAAC;IAC3D,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC;AACvC,CAAC;AALD,gDAKC;AAED,SAAgB,mBAAmB;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC;IAErF,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,2CAA2C,CAAC,CAAC;IAC1F,IAAI,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;QACxC,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC;QACjG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;KAC9C;IAED,MAAM,SAAS,GAA8B,EAAE,CAAC;IAChD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;QAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;QACzE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QACrE,uDAAuD;QACvD,IAAI,UAAU,GAAW,OAAO,WAAW,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;QAE1G,qGAAqG;QACrG,IAAI,CAAC,UAAU,EAAE;YAChB,+GAA+G;YAC/G,IAAI,GAAG,KAAK,WAAW,EAAE;gBACxB,OAAO,CAAC,IAAI,CAAC,sBAAsB,GAAG,kBAAkB,GAAG,SAAS,CAAC,CAAC;aACtE;YAED,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;SAClC;QAED,iEAAiE;QACjE,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAChC,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACrC;aAAM,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACtC,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACrC;QAED,2CAA2C;QAC3C,IAAI,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACxC,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAE9D,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE;gBACvE,UAAU,GAAG,aAAa,CAAC;aAC3B;SACD;QAED,SAAS,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;KAC5B;IAED,0EAA0E;IAC1E,oDAAoD;IACpD,oEAAoE;IACpE,iFAAiF;IACjF,SAAS,CAAC,4BAA4B,CAAC,GAAG,qCAAqC,CAAC;IAChF,SAAS,CAAC,sCAAsC,CAAC,GAAG,2CAA2C,CAAC;IAChG,SAAS,CAAC,wCAAwC,CAAC,GAAG,4CAA4C,CAAC;IACnG,OAAO,SAAS,CAAC;AAClB,CAAC;AAvDD,kDAuDC;AAQD,SAAgB,0BAA0B,CAAC,WAAoB,EAAE,MAAe,EAAE,OAAgB;IACjG,IAAI,CAAC,WAAW,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE;QACxC,OAAO,SAAS,CAAC;KACjB;IACD,WAAW,GAAG,WAAW,GAAG,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;IACpD,MAAM,SAAS,GAAG,mBAAmB,EAAE,CAAC;IACxC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAU,GAAG,EAAE,CAAC;QAC1C,SAAS,CAAC,GAAG,CAAC,GAAG,mBAAmB,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;IAC7D,CAAC,CAAC,CAAC;IACH,MAAM,oBAAoB,GAAwB;QACjD,OAAO,EAAE,GAAG,WAAW,MAAM;QAC7B,WAAW,EAAE,IAAI;QACjB,KAAK,EAAE,SAAS;KAChB,CAAC;IACF,OAAO,oBAAoB,CAAC;AAC7B,CAAC;AAfD,gEAeC;AAED,SAAgB,iBAAiB,CAAC,MAAc;IAC/C,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,mBAAmB,EAAE,CAAC;QACxC,wCAAwC;QACxC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACnD,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,MAAM,8BAA8B,GAAG;;;;;qEAK4B,CAAC;QACpE,MAAM,YAAY,GAAG,GAAG,8BAA8B,4BAA4B,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC;QACxH,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,oBAAoB,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QACtF,OAAO,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,QAAQ,GAAG,sBAAsB,CAAC;IACzC,OAAO,MAAM,CAAC;AACf,CAAC;AAnBD,8CAmBC"} \ No newline at end of file diff --git a/build/lib/util.ts b/build/lib/util.ts index 004f131e2fb..6648ce42364 100644 --- a/build/lib/util.ts +++ b/build/lib/util.ts @@ -77,7 +77,7 @@ export function incremental(streamProvider: IStreamProvider, initial: NodeJS.Rea return es.duplex(input, output); } -export function debounce(task: () => NodeJS.ReadWriteStream): NodeJS.ReadWriteStream { +export function debounce(task: () => NodeJS.ReadWriteStream, duration = 500): NodeJS.ReadWriteStream { const input = es.through(); const output = es.through(); let state = 'idle'; @@ -99,7 +99,7 @@ export function debounce(task: () => NodeJS.ReadWriteStream): NodeJS.ReadWriteSt run(); - const eventuallyRun = _debounce(() => run(), 500); + const eventuallyRun = _debounce(() => run(), duration); input.on('data', () => { if (state === 'idle') { @@ -219,7 +219,7 @@ export function loadSourcemaps(): NodeJS.ReadWriteStream { version: '3', names: [], mappings: '', - sources: [f.relative], + sources: [f.relative.replace(/\\/g, '/')], sourcesContent: [contents] }; @@ -384,16 +384,24 @@ export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise { }); } -export function getElectronVersion(): string { +export function getElectronVersion(): Record { const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8'); - const target = /^target "(.*)"$/m.exec(yarnrc)![1]; - return target; + const electronVersion = /^target "(.*)"$/m.exec(yarnrc)![1]; + const msBuildId = /^ms_build_id "(.*)"$/m.exec(yarnrc)![1]; + return { electronVersion, msBuildId }; } export function acquireWebNodePaths() { const root = path.join(__dirname, '..', '..'); const webPackageJSON = path.join(root, '/remote/web', 'package.json'); const webPackages = JSON.parse(fs.readFileSync(webPackageJSON, 'utf8')).dependencies; + + const distroWebPackageJson = path.join(root, '.build/distro/npm/remote/web/package.json'); + if (fs.existsSync(distroWebPackageJson)) { + const distroWebPackages = JSON.parse(fs.readFileSync(distroWebPackageJson, 'utf8')).dependencies; + Object.assign(webPackages, distroWebPackages); + } + const nodePaths: { [key: string]: string } = {}; for (const key of Object.keys(webPackages)) { const packageJSON = path.join(root, 'node_modules', key, 'package.json'); diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js index d9839581a8f..80146ba40e2 100644 --- a/build/linux/debian/calculate-deps.js +++ b/build/linux/debian/calculate-deps.js @@ -71,10 +71,18 @@ function calculatePackageDeps(binaryPath, arch, sysroot) { // on the newer package, this hack skips the dep. This is safe because // libgcc-s1 is a dependency of libc6. This hack can be removed once // support for Debian Buster and Ubuntu Bionic are dropped. + // + // Remove kerberos native module related dependencies as the versions + // computed from sysroot will not satisfy the minimum supported distros + // Refs https://github.com/microsoft/vscode/issues/188881. + // TODO(deepak1556): remove this workaround in favor of computing the + // versions from build container for native modules. const filteredDeps = depsStr.split(', ').filter(dependency => { - return !dependency.startsWith('libgcc-s1'); + return !dependency.startsWith('libgcc-s1') && + !dependency.startsWith('libgssapi-krb5-2') && + !dependency.startsWith('libkrb5-3'); }).sort(); const requires = new Set(filteredDeps); return requires; } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsY3VsYXRlLWRlcHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjYWxjdWxhdGUtZGVwcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxpREFBMEM7QUFDMUMsMkJBQXlDO0FBQ3pDLDJCQUE0QjtBQUM1Qiw2QkFBOEI7QUFDOUIsc0RBQXNEO0FBQ3RELDJDQUE2QztBQUc3QyxTQUFnQixtQkFBbUIsQ0FBQyxLQUFlLEVBQUUsSUFBc0IsRUFBRSxPQUFlO0lBQzNGLE1BQU0sWUFBWSxHQUFrQixLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ2pHLE1BQU0saUJBQWlCLEdBQUcsSUFBSSxHQUFHLENBQUMsMEJBQWMsQ0FBQyxDQUFDO0lBQ2xELFlBQVksQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUNyQyxPQUFPLFlBQVksQ0FBQztBQUNyQixDQUFDO0FBTEQsa0RBS0M7QUFFRCw2SEFBNkg7QUFDN0gsU0FBUyxvQkFBb0IsQ0FBQyxVQUFrQixFQUFFLElBQXNCLEVBQUUsT0FBZTtJQUN4RixJQUFJO1FBQ0gsSUFBSSxDQUFDLENBQUMsSUFBQSxhQUFRLEVBQUMsVUFBVSxDQUFDLENBQUMsSUFBSSxHQUFHLGNBQVMsQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUNyRCxNQUFNLElBQUksS0FBSyxDQUFDLFVBQVUsVUFBVSx1Q0FBdUMsQ0FBQyxDQUFDO1NBQzdFO0tBQ0Q7SUFBQyxPQUFPLENBQUMsRUFBRTtRQUNYLDhEQUE4RDtRQUM5RCxPQUFPLENBQUMsS0FBSyxDQUFDLGdCQUFnQixHQUFHLFVBQVUsR0FBRyxjQUFjLENBQUMsQ0FBQztLQUM5RDtJQUVELHdDQUF3QztJQUN4QyxNQUFNLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxFQUFFO1FBQ3RFLE9BQU8sWUFBWSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEtBQUssS0FBSyxJQUFJLFlBQVksQ0FBQyxTQUFTLENBQUMsR0FBSSxDQUFDLElBQUksS0FBSyxVQUFVLENBQUM7SUFDakcsQ0FBQyxDQUFDLENBQUM7SUFDSCxNQUFNLGdCQUFnQixHQUFHLHVEQUF1RCxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLCtDQUErQyxDQUFDO0lBQzNKLE1BQU0sMkJBQTJCLEdBQUcsR0FBRyxJQUFBLFdBQU0sR0FBRSxvQkFBb0IsQ0FBQztJQUNwRSxNQUFNLE1BQU0sR0FBRyxJQUFBLHlCQUFTLEVBQUMsTUFBTSxFQUFFLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxFQUFFLDJCQUEyQixDQUFDLENBQUMsQ0FBQztJQUN4RixJQUFJLE1BQU0sQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQ3hCLE1BQU0sSUFBSSxLQUFLLENBQUMsMkNBQTJDLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0tBQzdFO0lBQ0QsTUFBTSxHQUFHLEdBQUcsQ0FBQywyQkFBMkIsRUFBRSx5QkFBeUIsQ0FBQyxDQUFDO0lBQ3JFLFFBQVEsSUFBSSxFQUFFO1FBQ2IsS0FBSyxPQUFPO1lBQ1gsR0FBRyxDQUFDLElBQUksQ0FBQyxLQUFLLE9BQU8sMkJBQTJCLEVBQy9DLEtBQUssT0FBTyx1QkFBdUIsQ0FBQyxDQUFDO1lBQ3RDLE1BQU07UUFDUCxLQUFLLE9BQU87WUFDWCxHQUFHLENBQUMsSUFBSSxDQUFDLEtBQUssT0FBTyw4QkFBOEIsRUFDbEQsS0FBSyxPQUFPLDBCQUEwQixDQUFDLENBQUM7WUFDekMsTUFBTTtRQUNQLEtBQUssT0FBTztZQUNYLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxPQUFPLDRCQUE0QixFQUNoRCxLQUFLLE9BQU8sd0JBQXdCLENBQUMsQ0FBQztZQUN2QyxNQUFNO0tBQ1A7SUFDRCxHQUFHLENBQUMsSUFBSSxDQUFDLEtBQUssT0FBTyxVQUFVLENBQUMsQ0FBQztJQUNqQyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0lBRS9DLE1BQU0sbUJBQW1CLEdBQUcsSUFBQSx5QkFBUyxFQUFDLE1BQU0sRUFBRSxHQUFHLEVBQUUsRUFBRSxHQUFHLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUNyRSxJQUFJLG1CQUFtQixDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7UUFDckMsTUFBTSxJQUFJLEtBQUssQ0FBQyx3Q0FBd0MsbUJBQW1CLENBQUMsTUFBTSxjQUFjLG1CQUFtQixDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUM7S0FDL0g7SUFFRCxNQUFNLG1CQUFtQixHQUFHLGlCQUFpQixDQUFDO0lBQzlDLE1BQU0sWUFBWSxHQUFHLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hGLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQztJQUNqQixLQUFLLE1BQU0sSUFBSSxJQUFJLFlBQVksRUFBRTtRQUNoQyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsbUJBQW1CLENBQUMsRUFBRTtZQUN6QyxPQUFPLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztTQUNyRDtLQUNEO0lBQ0QseUVBQXlFO0lBQ3pFLDBFQUEwRTtJQUMxRSx5RUFBeUU7SUFDekUsdUVBQXVFO0lBQ3ZFLHFFQUFxRTtJQUNyRSwyREFBMkQ7SUFDM0QsTUFBTSxZQUFZLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEVBQUU7UUFDNUQsT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDNUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDVixNQUFNLFFBQVEsR0FBRyxJQUFJLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUN2QyxPQUFPLFFBQVEsQ0FBQztBQUNqQixDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsY3VsYXRlLWRlcHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjYWxjdWxhdGUtZGVwcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxpREFBMEM7QUFDMUMsMkJBQXlDO0FBQ3pDLDJCQUE0QjtBQUM1Qiw2QkFBOEI7QUFDOUIsc0RBQXNEO0FBQ3RELDJDQUE2QztBQUc3QyxTQUFnQixtQkFBbUIsQ0FBQyxLQUFlLEVBQUUsSUFBc0IsRUFBRSxPQUFlO0lBQzNGLE1BQU0sWUFBWSxHQUFrQixLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ2pHLE1BQU0saUJBQWlCLEdBQUcsSUFBSSxHQUFHLENBQUMsMEJBQWMsQ0FBQyxDQUFDO0lBQ2xELFlBQVksQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUNyQyxPQUFPLFlBQVksQ0FBQztBQUNyQixDQUFDO0FBTEQsa0RBS0M7QUFFRCw2SEFBNkg7QUFDN0gsU0FBUyxvQkFBb0IsQ0FBQyxVQUFrQixFQUFFLElBQXNCLEVBQUUsT0FBZTtJQUN4RixJQUFJO1FBQ0gsSUFBSSxDQUFDLENBQUMsSUFBQSxhQUFRLEVBQUMsVUFBVSxDQUFDLENBQUMsSUFBSSxHQUFHLGNBQVMsQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUNyRCxNQUFNLElBQUksS0FBSyxDQUFDLFVBQVUsVUFBVSx1Q0FBdUMsQ0FBQyxDQUFDO1NBQzdFO0tBQ0Q7SUFBQyxPQUFPLENBQUMsRUFBRTtRQUNYLDhEQUE4RDtRQUM5RCxPQUFPLENBQUMsS0FBSyxDQUFDLGdCQUFnQixHQUFHLFVBQVUsR0FBRyxjQUFjLENBQUMsQ0FBQztLQUM5RDtJQUVELHdDQUF3QztJQUN4QyxNQUFNLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxFQUFFO1FBQ3RFLE9BQU8sWUFBWSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEtBQUssS0FBSyxJQUFJLFlBQVksQ0FBQyxTQUFTLENBQUMsR0FBSSxDQUFDLElBQUksS0FBSyxVQUFVLENBQUM7SUFDakcsQ0FBQyxDQUFDLENBQUM7SUFDSCxNQUFNLGdCQUFnQixHQUFHLHVEQUF1RCxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLCtDQUErQyxDQUFDO0lBQzNKLE1BQU0sMkJBQTJCLEdBQUcsR0FBRyxJQUFBLFdBQU0sR0FBRSxvQkFBb0IsQ0FBQztJQUNwRSxNQUFNLE1BQU0sR0FBRyxJQUFBLHlCQUFTLEVBQUMsTUFBTSxFQUFFLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxFQUFFLDJCQUEyQixDQUFDLENBQUMsQ0FBQztJQUN4RixJQUFJLE1BQU0sQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQ3hCLE1BQU0sSUFBSSxLQUFLLENBQUMsMkNBQTJDLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0tBQzdFO0lBQ0QsTUFBTSxHQUFHLEdBQUcsQ0FBQywyQkFBMkIsRUFBRSx5QkFBeUIsQ0FBQyxDQUFDO0lBQ3JFLFFBQVEsSUFBSSxFQUFFO1FBQ2IsS0FBSyxPQUFPO1lBQ1gsR0FBRyxDQUFDLElBQUksQ0FBQyxLQUFLLE9BQU8sMkJBQTJCLEVBQy9DLEtBQUssT0FBTyx1QkFBdUIsQ0FBQyxDQUFDO1lBQ3RDLE1BQU07UUFDUCxLQUFLLE9BQU87WUFDWCxHQUFHLENBQUMsSUFBSSxDQUFDLEtBQUssT0FBTyw4QkFBOEIsRUFDbEQsS0FBSyxPQUFPLDBCQUEwQixDQUFDLENBQUM7WUFDekMsTUFBTTtRQUNQLEtBQUssT0FBTztZQUNYLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxPQUFPLDRCQUE0QixFQUNoRCxLQUFLLE9BQU8sd0JBQXdCLENBQUMsQ0FBQztZQUN2QyxNQUFNO0tBQ1A7SUFDRCxHQUFHLENBQUMsSUFBSSxDQUFDLEtBQUssT0FBTyxVQUFVLENBQUMsQ0FBQztJQUNqQyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0lBRS9DLE1BQU0sbUJBQW1CLEdBQUcsSUFBQSx5QkFBUyxFQUFDLE1BQU0sRUFBRSxHQUFHLEVBQUUsRUFBRSxHQUFHLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUNyRSxJQUFJLG1CQUFtQixDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7UUFDckMsTUFBTSxJQUFJLEtBQUssQ0FBQyx3Q0FBd0MsbUJBQW1CLENBQUMsTUFBTSxjQUFjLG1CQUFtQixDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUM7S0FDL0g7SUFFRCxNQUFNLG1CQUFtQixHQUFHLGlCQUFpQixDQUFDO0lBQzlDLE1BQU0sWUFBWSxHQUFHLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hGLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQztJQUNqQixLQUFLLE1BQU0sSUFBSSxJQUFJLFlBQVksRUFBRTtRQUNoQyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsbUJBQW1CLENBQUMsRUFBRTtZQUN6QyxPQUFPLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztTQUNyRDtLQUNEO0lBQ0QseUVBQXlFO0lBQ3pFLDBFQUEwRTtJQUMxRSx5RUFBeUU7SUFDekUsdUVBQXVFO0lBQ3ZFLHFFQUFxRTtJQUNyRSwyREFBMkQ7SUFDM0QsRUFBRTtJQUNGLHFFQUFxRTtJQUNyRSx1RUFBdUU7SUFDdkUsMERBQTBEO0lBQzFELHFFQUFxRTtJQUNyRSxvREFBb0Q7SUFDcEQsTUFBTSxZQUFZLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEVBQUU7UUFDNUQsT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDO1lBQ3pDLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxrQkFBa0IsQ0FBQztZQUMxQyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDdEMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDVixNQUFNLFFBQVEsR0FBRyxJQUFJLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUN2QyxPQUFPLFFBQVEsQ0FBQztBQUNqQixDQUFDIn0= \ No newline at end of file diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts index b13d3cdfaaf..a23c41ace24 100644 --- a/build/linux/debian/calculate-deps.ts +++ b/build/linux/debian/calculate-deps.ts @@ -76,8 +76,16 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, sysroo // on the newer package, this hack skips the dep. This is safe because // libgcc-s1 is a dependency of libc6. This hack can be removed once // support for Debian Buster and Ubuntu Bionic are dropped. + // + // Remove kerberos native module related dependencies as the versions + // computed from sysroot will not satisfy the minimum supported distros + // Refs https://github.com/microsoft/vscode/issues/188881. + // TODO(deepak1556): remove this workaround in favor of computing the + // versions from build container for native modules. const filteredDeps = depsStr.split(', ').filter(dependency => { - return !dependency.startsWith('libgcc-s1'); + return !dependency.startsWith('libgcc-s1') && + !dependency.startsWith('libgssapi-krb5-2') && + !dependency.startsWith('libkrb5-3'); }).sort(); const requires = new Set(filteredDeps); return requires; diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js index 498fb4ea6ed..659d36b73b7 100644 --- a/build/linux/debian/dep-lists.js +++ b/build/linux/debian/dep-lists.js @@ -12,7 +12,9 @@ exports.additionalDeps = [ 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', 'libnss3 (>= 3.26)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', - 'xdg-utils (>= 1.0.2)' // OS integration + 'xdg-utils (>= 1.0.2)', + 'libgssapi-krb5-2', + 'libkrb5-3', ]; // Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/manual_recommends // Dependencies that we can only recommend @@ -38,8 +40,10 @@ exports.referenceGeneratedDepsByArch = { 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.16.0)', 'libglib2.0-0 (>= 2.39.4)', + 'libgssapi-krb5-2', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libkrb5-3', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.22)', 'libnss3 (>= 3.26)', @@ -63,9 +67,10 @@ exports.referenceGeneratedDepsByArch = { 'libatk-bridge2.0-0 (>= 2.5.3)', 'libatk1.0-0 (>= 2.2.0)', 'libatspi2.0-0 (>= 2.9.90)', + 'libc6 (>= 2.15)', 'libc6 (>= 2.17)', - 'libc6 (>= 2.28)', 'libc6 (>= 2.4)', + 'libc6 (>= 2.8)', 'libc6 (>= 2.9)', 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', @@ -73,16 +78,17 @@ exports.referenceGeneratedDepsByArch = { 'libdrm2 (>= 2.4.60)', 'libexpat1 (>= 2.0.1)', 'libgbm1 (>= 17.1.0~rc2)', - 'libglib2.0-0 (>= 2.16.0)', + 'libglib2.0-0 (>= 2.12.0)', 'libglib2.0-0 (>= 2.39.4)', + 'libgssapi-krb5-2', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libkrb5-3', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.22)', 'libnss3 (>= 3.26)', 'libpango-1.0-0 (>= 1.14.0)', 'libsecret-1-0 (>= 0.18)', - 'libstdc++6 (>= 4.1.1)', 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', @@ -105,23 +111,23 @@ exports.referenceGeneratedDepsByArch = { 'libatk1.0-0 (>= 2.2.0)', 'libatspi2.0-0 (>= 2.9.90)', 'libc6 (>= 2.17)', - 'libc6 (>= 2.28)', 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', 'libdbus-1-3 (>= 1.0.2)', 'libdrm2 (>= 2.4.60)', 'libexpat1 (>= 2.0.1)', 'libgbm1 (>= 17.1.0~rc2)', - 'libglib2.0-0 (>= 2.16.0)', + 'libglib2.0-0 (>= 2.12.0)', 'libglib2.0-0 (>= 2.39.4)', + 'libgssapi-krb5-2', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libkrb5-3', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.22)', 'libnss3 (>= 3.26)', 'libpango-1.0-0 (>= 1.14.0)', 'libsecret-1-0 (>= 0.18)', - 'libstdc++6 (>= 4.1.1)', 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', @@ -138,4 +144,4 @@ exports.referenceGeneratedDepsByArch = { 'xdg-utils (>= 1.0.2)' ] }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwLWxpc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGVwLWxpc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBRWhHLGtIQUFrSDtBQUNsSCw0REFBNEQ7QUFDL0MsUUFBQSxjQUFjLEdBQUc7SUFDN0IsaUJBQWlCO0lBQ2pCLHFDQUFxQztJQUNyQyxtQkFBbUI7SUFDbkIsc0RBQXNEO0lBQ3RELHNCQUFzQixDQUFDLGlCQUFpQjtDQUN4QyxDQUFDO0FBRUYsb0hBQW9IO0FBQ3BILDBDQUEwQztBQUMxQyw4REFBOEQ7QUFDakQsUUFBQSxlQUFlLEdBQUc7SUFDOUIsWUFBWSxDQUFDLHlFQUF5RTtDQUN0RixDQUFDO0FBRVcsUUFBQSw0QkFBNEIsR0FBRztJQUMzQyxPQUFPLEVBQUU7UUFDUixpQkFBaUI7UUFDakIsd0JBQXdCO1FBQ3hCLCtCQUErQjtRQUMvQix3QkFBd0I7UUFDeEIsMkJBQTJCO1FBQzNCLGlCQUFpQjtRQUNqQixpQkFBaUI7UUFDakIsa0JBQWtCO1FBQ2xCLHNCQUFzQjtRQUN0QixzREFBc0Q7UUFDdEQseUJBQXlCO1FBQ3pCLHFCQUFxQjtRQUNyQixzQkFBc0I7UUFDdEIseUJBQXlCO1FBQ3pCLDBCQUEwQjtRQUMxQiwwQkFBMEI7UUFDMUIsd0JBQXdCO1FBQ3hCLHFDQUFxQztRQUNyQyx3QkFBd0I7UUFDeEIscUJBQXFCO1FBQ3JCLG1CQUFtQjtRQUNuQiw0QkFBNEI7UUFDNUIseUJBQXlCO1FBQ3pCLFVBQVU7UUFDViwwQkFBMEI7UUFDMUIsb0JBQW9CO1FBQ3BCLCtCQUErQjtRQUMvQix3QkFBd0I7UUFDeEIsVUFBVTtRQUNWLFlBQVk7UUFDWiwwQkFBMEI7UUFDMUIsYUFBYTtRQUNiLFlBQVk7UUFDWixzQkFBc0I7S0FDdEI7SUFDRCxPQUFPLEVBQUU7UUFDUixpQkFBaUI7UUFDakIsd0JBQXdCO1FBQ3hCLCtCQUErQjtRQUMvQix3QkFBd0I7UUFDeEIsMkJBQTJCO1FBQzNCLGlCQUFpQjtRQUNqQixpQkFBaUI7UUFDakIsZ0JBQWdCO1FBQ2hCLGdCQUFnQjtRQUNoQixzQkFBc0I7UUFDdEIsc0RBQXNEO1FBQ3RELHlCQUF5QjtRQUN6QixxQkFBcUI7UUFDckIsc0JBQXNCO1FBQ3RCLHlCQUF5QjtRQUN6QiwwQkFBMEI7UUFDMUIsMEJBQTBCO1FBQzFCLHdCQUF3QjtRQUN4QixxQ0FBcUM7UUFDckMsd0JBQXdCO1FBQ3hCLHFCQUFxQjtRQUNyQixtQkFBbUI7UUFDbkIsNEJBQTRCO1FBQzVCLHlCQUF5QjtRQUN6Qix1QkFBdUI7UUFDdkIsbUJBQW1CO1FBQ25CLHFCQUFxQjtRQUNyQixtQkFBbUI7UUFDbkIsVUFBVTtRQUNWLDBCQUEwQjtRQUMxQixvQkFBb0I7UUFDcEIsK0JBQStCO1FBQy9CLHdCQUF3QjtRQUN4QixVQUFVO1FBQ1YsWUFBWTtRQUNaLDBCQUEwQjtRQUMxQixhQUFhO1FBQ2IsWUFBWTtRQUNaLHNCQUFzQjtLQUN0QjtJQUNELE9BQU8sRUFBRTtRQUNSLGlCQUFpQjtRQUNqQix3QkFBd0I7UUFDeEIsK0JBQStCO1FBQy9CLHdCQUF3QjtRQUN4QiwyQkFBMkI7UUFDM0IsaUJBQWlCO1FBQ2pCLGlCQUFpQjtRQUNqQixzQkFBc0I7UUFDdEIsc0RBQXNEO1FBQ3RELHdCQUF3QjtRQUN4QixxQkFBcUI7UUFDckIsc0JBQXNCO1FBQ3RCLHlCQUF5QjtRQUN6QiwwQkFBMEI7UUFDMUIsMEJBQTBCO1FBQzFCLHdCQUF3QjtRQUN4QixxQ0FBcUM7UUFDckMsd0JBQXdCO1FBQ3hCLHFCQUFxQjtRQUNyQixtQkFBbUI7UUFDbkIsNEJBQTRCO1FBQzVCLHlCQUF5QjtRQUN6Qix1QkFBdUI7UUFDdkIsbUJBQW1CO1FBQ25CLHFCQUFxQjtRQUNyQixtQkFBbUI7UUFDbkIsVUFBVTtRQUNWLDBCQUEwQjtRQUMxQixvQkFBb0I7UUFDcEIsK0JBQStCO1FBQy9CLHdCQUF3QjtRQUN4QixVQUFVO1FBQ1YsWUFBWTtRQUNaLDBCQUEwQjtRQUMxQixhQUFhO1FBQ2IsWUFBWTtRQUNaLHNCQUFzQjtLQUN0QjtDQUNELENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwLWxpc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGVwLWxpc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBRWhHLGtIQUFrSDtBQUNsSCw0REFBNEQ7QUFDL0MsUUFBQSxjQUFjLEdBQUc7SUFDN0IsaUJBQWlCO0lBQ2pCLHFDQUFxQztJQUNyQyxtQkFBbUI7SUFDbkIsc0RBQXNEO0lBQ3RELHNCQUFzQjtJQUN0QixrQkFBa0I7SUFDbEIsV0FBVztDQUNYLENBQUM7QUFFRixvSEFBb0g7QUFDcEgsMENBQTBDO0FBQzFDLDhEQUE4RDtBQUNqRCxRQUFBLGVBQWUsR0FBRztJQUM5QixZQUFZLENBQUMseUVBQXlFO0NBQ3RGLENBQUM7QUFFVyxRQUFBLDRCQUE0QixHQUFHO0lBQzNDLE9BQU8sRUFBRTtRQUNSLGlCQUFpQjtRQUNqQix3QkFBd0I7UUFDeEIsK0JBQStCO1FBQy9CLHdCQUF3QjtRQUN4QiwyQkFBMkI7UUFDM0IsaUJBQWlCO1FBQ2pCLGlCQUFpQjtRQUNqQixrQkFBa0I7UUFDbEIsc0JBQXNCO1FBQ3RCLHNEQUFzRDtRQUN0RCx5QkFBeUI7UUFDekIscUJBQXFCO1FBQ3JCLHNCQUFzQjtRQUN0Qix5QkFBeUI7UUFDekIsMEJBQTBCO1FBQzFCLDBCQUEwQjtRQUMxQixrQkFBa0I7UUFDbEIsd0JBQXdCO1FBQ3hCLHFDQUFxQztRQUNyQyxXQUFXO1FBQ1gsd0JBQXdCO1FBQ3hCLHFCQUFxQjtRQUNyQixtQkFBbUI7UUFDbkIsNEJBQTRCO1FBQzVCLHlCQUF5QjtRQUN6QixVQUFVO1FBQ1YsMEJBQTBCO1FBQzFCLG9CQUFvQjtRQUNwQiwrQkFBK0I7UUFDL0Isd0JBQXdCO1FBQ3hCLFVBQVU7UUFDVixZQUFZO1FBQ1osMEJBQTBCO1FBQzFCLGFBQWE7UUFDYixZQUFZO1FBQ1osc0JBQXNCO0tBQ3RCO0lBQ0QsT0FBTyxFQUFFO1FBQ1IsaUJBQWlCO1FBQ2pCLHdCQUF3QjtRQUN4QiwrQkFBK0I7UUFDL0Isd0JBQXdCO1FBQ3hCLDJCQUEyQjtRQUMzQixpQkFBaUI7UUFDakIsaUJBQWlCO1FBQ2pCLGdCQUFnQjtRQUNoQixnQkFBZ0I7UUFDaEIsZ0JBQWdCO1FBQ2hCLHNCQUFzQjtRQUN0QixzREFBc0Q7UUFDdEQseUJBQXlCO1FBQ3pCLHFCQUFxQjtRQUNyQixzQkFBc0I7UUFDdEIseUJBQXlCO1FBQ3pCLDBCQUEwQjtRQUMxQiwwQkFBMEI7UUFDMUIsa0JBQWtCO1FBQ2xCLHdCQUF3QjtRQUN4QixxQ0FBcUM7UUFDckMsV0FBVztRQUNYLHdCQUF3QjtRQUN4QixxQkFBcUI7UUFDckIsbUJBQW1CO1FBQ25CLDRCQUE0QjtRQUM1Qix5QkFBeUI7UUFDekIsbUJBQW1CO1FBQ25CLHFCQUFxQjtRQUNyQixtQkFBbUI7UUFDbkIsVUFBVTtRQUNWLDBCQUEwQjtRQUMxQixvQkFBb0I7UUFDcEIsK0JBQStCO1FBQy9CLHdCQUF3QjtRQUN4QixVQUFVO1FBQ1YsWUFBWTtRQUNaLDBCQUEwQjtRQUMxQixhQUFhO1FBQ2IsWUFBWTtRQUNaLHNCQUFzQjtLQUN0QjtJQUNELE9BQU8sRUFBRTtRQUNSLGlCQUFpQjtRQUNqQix3QkFBd0I7UUFDeEIsK0JBQStCO1FBQy9CLHdCQUF3QjtRQUN4QiwyQkFBMkI7UUFDM0IsaUJBQWlCO1FBQ2pCLHNCQUFzQjtRQUN0QixzREFBc0Q7UUFDdEQsd0JBQXdCO1FBQ3hCLHFCQUFxQjtRQUNyQixzQkFBc0I7UUFDdEIseUJBQXlCO1FBQ3pCLDBCQUEwQjtRQUMxQiwwQkFBMEI7UUFDMUIsa0JBQWtCO1FBQ2xCLHdCQUF3QjtRQUN4QixxQ0FBcUM7UUFDckMsV0FBVztRQUNYLHdCQUF3QjtRQUN4QixxQkFBcUI7UUFDckIsbUJBQW1CO1FBQ25CLDRCQUE0QjtRQUM1Qix5QkFBeUI7UUFDekIsbUJBQW1CO1FBQ25CLHFCQUFxQjtRQUNyQixtQkFBbUI7UUFDbkIsVUFBVTtRQUNWLDBCQUEwQjtRQUMxQixvQkFBb0I7UUFDcEIsK0JBQStCO1FBQy9CLHdCQUF3QjtRQUN4QixVQUFVO1FBQ1YsWUFBWTtRQUNaLDBCQUEwQjtRQUMxQixhQUFhO1FBQ2IsWUFBWTtRQUNaLHNCQUFzQjtLQUN0QjtDQUNELENBQUMifQ== \ No newline at end of file diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts index 52aa56d960b..aace840a29b 100644 --- a/build/linux/debian/dep-lists.ts +++ b/build/linux/debian/dep-lists.ts @@ -10,7 +10,9 @@ export const additionalDeps = [ 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', 'libnss3 (>= 3.26)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', // For Breakpad crash reports. - 'xdg-utils (>= 1.0.2)' // OS integration + 'xdg-utils (>= 1.0.2)', // OS integration + 'libgssapi-krb5-2', + 'libkrb5-3', ]; // Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/manual_recommends @@ -38,8 +40,10 @@ export const referenceGeneratedDepsByArch = { 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.16.0)', 'libglib2.0-0 (>= 2.39.4)', + 'libgssapi-krb5-2', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libkrb5-3', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.22)', 'libnss3 (>= 3.26)', @@ -63,9 +67,10 @@ export const referenceGeneratedDepsByArch = { 'libatk-bridge2.0-0 (>= 2.5.3)', 'libatk1.0-0 (>= 2.2.0)', 'libatspi2.0-0 (>= 2.9.90)', + 'libc6 (>= 2.15)', 'libc6 (>= 2.17)', - 'libc6 (>= 2.28)', 'libc6 (>= 2.4)', + 'libc6 (>= 2.8)', 'libc6 (>= 2.9)', 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', @@ -73,16 +78,17 @@ export const referenceGeneratedDepsByArch = { 'libdrm2 (>= 2.4.60)', 'libexpat1 (>= 2.0.1)', 'libgbm1 (>= 17.1.0~rc2)', - 'libglib2.0-0 (>= 2.16.0)', + 'libglib2.0-0 (>= 2.12.0)', 'libglib2.0-0 (>= 2.39.4)', + 'libgssapi-krb5-2', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libkrb5-3', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.22)', 'libnss3 (>= 3.26)', 'libpango-1.0-0 (>= 1.14.0)', 'libsecret-1-0 (>= 0.18)', - 'libstdc++6 (>= 4.1.1)', 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', @@ -105,23 +111,23 @@ export const referenceGeneratedDepsByArch = { 'libatk1.0-0 (>= 2.2.0)', 'libatspi2.0-0 (>= 2.9.90)', 'libc6 (>= 2.17)', - 'libc6 (>= 2.28)', 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', 'libdbus-1-3 (>= 1.0.2)', 'libdrm2 (>= 2.4.60)', 'libexpat1 (>= 2.0.1)', 'libgbm1 (>= 17.1.0~rc2)', - 'libglib2.0-0 (>= 2.16.0)', + 'libglib2.0-0 (>= 2.12.0)', 'libglib2.0-0 (>= 2.39.4)', + 'libgssapi-krb5-2', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libkrb5-3', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.22)', 'libnss3 (>= 3.26)', 'libpango-1.0-0 (>= 1.14.0)', 'libsecret-1-0 (>= 0.18)', - 'libstdc++6 (>= 4.1.1)', 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js index f249ad032cb..0197f5f2571 100644 --- a/build/linux/debian/install-sysroot.js +++ b/build/linux/debian/install-sysroot.js @@ -30,7 +30,7 @@ function getSha(filename) { return hash.digest('hex'); } async function getSysroot(arch) { - const sysrootJSONUrl = `https://raw.githubusercontent.com/electron/electron/v${util.getElectronVersion()}/script/sysroots.json`; + const sysrootJSONUrl = `https://raw.githubusercontent.com/electron/electron/v${util.getElectronVersion().electronVersion}/script/sysroots.json`; const sysrootDictLocation = `${(0, os_1.tmpdir)()}/sysroots.json`; const result = (0, child_process_1.spawnSync)('curl', [sysrootJSONUrl, '-o', sysrootDictLocation]); if (result.status !== 0) { @@ -87,4 +87,4 @@ async function getSysroot(arch) { return sysroot; } exports.getSysroot = getSysroot; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdGFsbC1zeXNyb290LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW5zdGFsbC1zeXNyb290LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBRWhHLGlEQUEwQztBQUMxQyxtQ0FBb0M7QUFDcEMsMkJBQTRCO0FBQzVCLHlCQUF5QjtBQUN6QiwrQkFBK0I7QUFDL0IsNkJBQTZCO0FBRTdCLHVDQUF1QztBQUV2QyxvSEFBb0g7QUFDcEgsTUFBTSxVQUFVLEdBQUcsNENBQTRDLENBQUM7QUFDaEUsTUFBTSxRQUFRLEdBQUcsb0JBQW9CLENBQUM7QUFFdEMsU0FBUyxNQUFNLENBQUMsUUFBcUI7SUFDcEMsTUFBTSxJQUFJLEdBQUcsSUFBQSxtQkFBVSxFQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2hDLDJCQUEyQjtJQUMzQixNQUFNLEVBQUUsR0FBRyxFQUFFLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUN0QyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsQ0FBQztJQUN6QyxJQUFJLFFBQVEsR0FBRyxDQUFDLENBQUM7SUFDakIsSUFBSSxTQUFTLEdBQUcsQ0FBQyxDQUFDO0lBQ2xCLE9BQU8sQ0FBQyxTQUFTLEdBQUcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUFDLEtBQUssTUFBTSxDQUFDLE1BQU0sRUFBRTtRQUMzRixJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3BCLFFBQVEsSUFBSSxTQUFTLENBQUM7S0FDdEI7SUFDRCxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDeEMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQzNCLENBQUM7QUFRTSxLQUFLLFVBQVUsVUFBVSxDQUFDLElBQXNCO0lBQ3RELE1BQU0sY0FBYyxHQUFHLHdEQUF3RCxJQUFJLENBQUMsa0JBQWtCLEVBQUUsdUJBQXVCLENBQUM7SUFDaEksTUFBTSxtQkFBbUIsR0FBRyxHQUFHLElBQUEsV0FBTSxHQUFFLGdCQUFnQixDQUFDO0lBQ3hELE1BQU0sTUFBTSxHQUFHLElBQUEseUJBQVMsRUFBQyxNQUFNLEVBQUUsQ0FBQyxjQUFjLEVBQUUsSUFBSSxFQUFFLG1CQUFtQixDQUFDLENBQUMsQ0FBQztJQUM5RSxJQUFJLE1BQU0sQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQ3hCLE1BQU0sSUFBSSxLQUFLLENBQUMsMENBQTBDLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0tBQzVFO0lBQ0QsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFDakQsTUFBTSxXQUFXLEdBQUcsSUFBSSxLQUFLLE9BQU8sQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxZQUFZLElBQUksRUFBRSxDQUFDO0lBQzNFLE1BQU0sV0FBVyxHQUFxQixXQUFXLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDL0QsTUFBTSxlQUFlLEdBQUcsV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQy9DLE1BQU0sVUFBVSxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUMxQyxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUEsV0FBTSxHQUFFLEVBQUUsV0FBVyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7SUFDL0QsTUFBTSxHQUFHLEdBQUcsQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDMUUsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDM0MsSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUMsUUFBUSxFQUFFLEtBQUssR0FBRyxFQUFFO1FBQ3RFLE9BQU8sT0FBTyxDQUFDO0tBQ2Y7SUFFRCxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQixJQUFJLGdCQUFnQixPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBQ2hFLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNyRCxFQUFFLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3RCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBQ3BELE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQ2xDLElBQUksZUFBZSxHQUFHLEtBQUssQ0FBQztJQUM1QixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQy9DLEVBQUUsQ0FBQyxhQUFhLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQzlCLE1BQU0sSUFBSSxPQUFPLENBQU8sQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUM3QixLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLEdBQUcsRUFBRSxFQUFFO2dCQUN0QixHQUFHLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO29CQUN4QixFQUFFLENBQUMsY0FBYyxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQztnQkFDbkMsQ0FBQyxDQUFDLENBQUM7Z0JBQ0gsR0FBRyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFO29CQUNsQixlQUFlLEdBQUcsSUFBSSxDQUFDO29CQUN2QixDQUFDLEVBQUUsQ0FBQztnQkFDTCxDQUFDLENBQUMsQ0FBQztZQUNKLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRTtnQkFDdEIsT0FBTyxDQUFDLEtBQUssQ0FBQyxvREFBb0QsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ2xGLENBQUMsRUFBRSxDQUFDO1lBQ0wsQ0FBQyxDQUFDLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztLQUNIO0lBQ0QsSUFBSSxDQUFDLGVBQWUsRUFBRTtRQUNyQixFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ25CLE1BQU0sSUFBSSxLQUFLLENBQUMscUJBQXFCLEdBQUcsR0FBRyxDQUFDLENBQUM7S0FDN0M7SUFDRCxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDNUIsSUFBSSxHQUFHLEtBQUssVUFBVSxFQUFFO1FBQ3ZCLE1BQU0sSUFBSSxLQUFLLENBQUMsc0NBQXNDLFVBQVUsWUFBWSxHQUFHLEVBQUUsQ0FBQyxDQUFDO0tBQ25GO0lBRUQsTUFBTSxJQUFJLEdBQUcsSUFBQSx5QkFBUyxFQUFDLEtBQUssRUFBRSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFDOUQsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFO1FBQ2hCLE1BQU0sSUFBSSxLQUFLLENBQUMsc0NBQXNDLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0tBQ3RFO0lBQ0QsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNuQixFQUFFLENBQUMsYUFBYSxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztJQUM3QixPQUFPLE9BQU8sQ0FBQztBQUNoQixDQUFDO0FBMURELGdDQTBEQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdGFsbC1zeXNyb290LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW5zdGFsbC1zeXNyb290LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBRWhHLGlEQUEwQztBQUMxQyxtQ0FBb0M7QUFDcEMsMkJBQTRCO0FBQzVCLHlCQUF5QjtBQUN6QiwrQkFBK0I7QUFDL0IsNkJBQTZCO0FBRTdCLHVDQUF1QztBQUV2QyxvSEFBb0g7QUFDcEgsTUFBTSxVQUFVLEdBQUcsNENBQTRDLENBQUM7QUFDaEUsTUFBTSxRQUFRLEdBQUcsb0JBQW9CLENBQUM7QUFFdEMsU0FBUyxNQUFNLENBQUMsUUFBcUI7SUFDcEMsTUFBTSxJQUFJLEdBQUcsSUFBQSxtQkFBVSxFQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2hDLDJCQUEyQjtJQUMzQixNQUFNLEVBQUUsR0FBRyxFQUFFLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUN0QyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsQ0FBQztJQUN6QyxJQUFJLFFBQVEsR0FBRyxDQUFDLENBQUM7SUFDakIsSUFBSSxTQUFTLEdBQUcsQ0FBQyxDQUFDO0lBQ2xCLE9BQU8sQ0FBQyxTQUFTLEdBQUcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUFDLEtBQUssTUFBTSxDQUFDLE1BQU0sRUFBRTtRQUMzRixJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3BCLFFBQVEsSUFBSSxTQUFTLENBQUM7S0FDdEI7SUFDRCxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDeEMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQzNCLENBQUM7QUFRTSxLQUFLLFVBQVUsVUFBVSxDQUFDLElBQXNCO0lBQ3RELE1BQU0sY0FBYyxHQUFHLHdEQUF3RCxJQUFJLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxlQUFlLHVCQUF1QixDQUFDO0lBQ2hKLE1BQU0sbUJBQW1CLEdBQUcsR0FBRyxJQUFBLFdBQU0sR0FBRSxnQkFBZ0IsQ0FBQztJQUN4RCxNQUFNLE1BQU0sR0FBRyxJQUFBLHlCQUFTLEVBQUMsTUFBTSxFQUFFLENBQUMsY0FBYyxFQUFFLElBQUksRUFBRSxtQkFBbUIsQ0FBQyxDQUFDLENBQUM7SUFDOUUsSUFBSSxNQUFNLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtRQUN4QixNQUFNLElBQUksS0FBSyxDQUFDLDBDQUEwQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUM1RTtJQUNELE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0lBQ2pELE1BQU0sV0FBVyxHQUFHLElBQUksS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsWUFBWSxJQUFJLEVBQUUsQ0FBQztJQUMzRSxNQUFNLFdBQVcsR0FBcUIsV0FBVyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQy9ELE1BQU0sZUFBZSxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUMvQyxNQUFNLFVBQVUsR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDMUMsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFBLFdBQU0sR0FBRSxFQUFFLFdBQVcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO0lBQy9ELE1BQU0sR0FBRyxHQUFHLENBQUMsVUFBVSxFQUFFLFFBQVEsRUFBRSxVQUFVLEVBQUUsZUFBZSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzFFLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQzNDLElBQUksRUFBRSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDLFFBQVEsRUFBRSxLQUFLLEdBQUcsRUFBRTtRQUN0RSxPQUFPLE9BQU8sQ0FBQztLQUNmO0lBRUQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsSUFBSSxnQkFBZ0IsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUNoRSxFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFDckQsRUFBRSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN0QixNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxlQUFlLENBQUMsQ0FBQztJQUNwRCxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUNsQyxJQUFJLGVBQWUsR0FBRyxLQUFLLENBQUM7SUFDNUIsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUMvQyxFQUFFLENBQUMsYUFBYSxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUM5QixNQUFNLElBQUksT0FBTyxDQUFPLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDN0IsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRTtnQkFDdEIsR0FBRyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtvQkFDeEIsRUFBRSxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7Z0JBQ25DLENBQUMsQ0FBQyxDQUFDO2dCQUNILEdBQUcsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRTtvQkFDbEIsZUFBZSxHQUFHLElBQUksQ0FBQztvQkFDdkIsQ0FBQyxFQUFFLENBQUM7Z0JBQ0wsQ0FBQyxDQUFDLENBQUM7WUFDSixDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLENBQUMsR0FBRyxFQUFFLEVBQUU7Z0JBQ3RCLE9BQU8sQ0FBQyxLQUFLLENBQUMsb0RBQW9ELEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNsRixDQUFDLEVBQUUsQ0FBQztZQUNMLENBQUMsQ0FBQyxDQUFDO1FBQ0osQ0FBQyxDQUFDLENBQUM7S0FDSDtJQUNELElBQUksQ0FBQyxlQUFlLEVBQUU7UUFDckIsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNuQixNQUFNLElBQUksS0FBSyxDQUFDLHFCQUFxQixHQUFHLEdBQUcsQ0FBQyxDQUFDO0tBQzdDO0lBQ0QsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzVCLElBQUksR0FBRyxLQUFLLFVBQVUsRUFBRTtRQUN2QixNQUFNLElBQUksS0FBSyxDQUFDLHNDQUFzQyxVQUFVLFlBQVksR0FBRyxFQUFFLENBQUMsQ0FBQztLQUNuRjtJQUVELE1BQU0sSUFBSSxHQUFHLElBQUEseUJBQVMsRUFBQyxLQUFLLEVBQUUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQzlELElBQUksSUFBSSxDQUFDLE1BQU0sRUFBRTtRQUNoQixNQUFNLElBQUksS0FBSyxDQUFDLHNDQUFzQyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUN0RTtJQUNELEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkIsRUFBRSxDQUFDLGFBQWEsQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDN0IsT0FBTyxPQUFPLENBQUM7QUFDaEIsQ0FBQztBQTFERCxnQ0EwREMifQ== \ No newline at end of file diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts index ac9de5b8578..49eb4a67127 100644 --- a/build/linux/debian/install-sysroot.ts +++ b/build/linux/debian/install-sysroot.ts @@ -38,7 +38,7 @@ type SysrootDictEntry = { }; export async function getSysroot(arch: DebianArchString): Promise { - const sysrootJSONUrl = `https://raw.githubusercontent.com/electron/electron/v${util.getElectronVersion()}/script/sysroots.json`; + const sysrootJSONUrl = `https://raw.githubusercontent.com/electron/electron/v${util.getElectronVersion().electronVersion}/script/sysroots.json`; const sysrootDictLocation = `${tmpdir()}/sysroots.json`; const result = spawnSync('curl', [sysrootJSONUrl, '-o', sysrootDictLocation]); if (result.status !== 0) { diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js index 1c9177c1671..e6b9a389064 100644 --- a/build/linux/rpm/dep-lists.js +++ b/build/linux/rpm/dep-lists.js @@ -65,7 +65,11 @@ exports.referenceGeneratedDepsByArch = { 'libgio-2.0.so.0()(64bit)', 'libglib-2.0.so.0()(64bit)', 'libgobject-2.0.so.0()(64bit)', + 'libgssapi_krb5.so.2()(64bit)', + 'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)', 'libgtk-3.so.0()(64bit)', + 'libkrb5.so.3()(64bit)', + 'libkrb5.so.3(krb5_3_MIT)(64bit)', 'libm.so.6()(64bit)', 'libm.so.6(GLIBC_2.2.5)(64bit)', 'libnspr4.so()(64bit)', @@ -126,8 +130,6 @@ exports.referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.15)', 'libc.so.6(GLIBC_2.16)', 'libc.so.6(GLIBC_2.17)', - 'libc.so.6(GLIBC_2.25)', - 'libc.so.6(GLIBC_2.28)', 'libc.so.6(GLIBC_2.4)', 'libc.so.6(GLIBC_2.6)', 'libc.so.6(GLIBC_2.7)', @@ -147,8 +149,12 @@ exports.referenceGeneratedDepsByArch = { 'libgio-2.0.so.0', 'libglib-2.0.so.0', 'libgobject-2.0.so.0', + 'libgssapi_krb5.so.2', + 'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)', 'libgtk-3.so.0', 'libgtk-3.so.0()(64bit)', + 'libkrb5.so.3', + 'libkrb5.so.3(krb5_3_MIT)', 'libm.so.6', 'libm.so.6(GLIBC_2.4)', 'libnspr4.so', @@ -220,8 +226,6 @@ exports.referenceGeneratedDepsByArch = { 'libatspi.so.0()(64bit)', 'libc.so.6()(64bit)', 'libc.so.6(GLIBC_2.17)(64bit)', - 'libc.so.6(GLIBC_2.25)(64bit)', - 'libc.so.6(GLIBC_2.28)(64bit)', 'libcairo.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', @@ -238,7 +242,11 @@ exports.referenceGeneratedDepsByArch = { 'libgio-2.0.so.0()(64bit)', 'libglib-2.0.so.0()(64bit)', 'libgobject-2.0.so.0()(64bit)', + 'libgssapi_krb5.so.2()(64bit)', + 'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)', 'libgtk-3.so.0()(64bit)', + 'libkrb5.so.3()(64bit)', + 'libkrb5.so.3(krb5_3_MIT)(64bit)', 'libm.so.6()(64bit)', 'libm.so.6(GLIBC_2.17)(64bit)', 'libnspr4.so()(64bit)', @@ -291,4 +299,4 @@ exports.referenceGeneratedDepsByArch = { 'xdg-utils' ] }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwLWxpc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGVwLWxpc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBRWhHLCtHQUErRztBQUMvRywrREFBK0Q7QUFDbEQsUUFBQSxjQUFjLEdBQUc7SUFDN0IsaUJBQWlCO0lBQ2pCLHdCQUF3QjtJQUN4Qiw2QkFBNkI7SUFDN0IsNkJBQTZCO0lBQzdCLGdDQUFnQztJQUNoQyx5QkFBeUI7SUFDekIsdUJBQXVCO0lBQ3ZCLFdBQVcsQ0FBQyxpQkFBaUI7Q0FDN0IsQ0FBQztBQUVXLFFBQUEsNEJBQTRCLEdBQUc7SUFDM0MsUUFBUSxFQUFFO1FBQ1QsaUJBQWlCO1FBQ2pCLCtCQUErQjtRQUMvQiwwQ0FBMEM7UUFDMUMsd0NBQXdDO1FBQ3hDLHNCQUFzQjtRQUN0Qiw2QkFBNkI7UUFDN0IsMEJBQTBCO1FBQzFCLHVCQUF1QjtRQUN2Qix5QkFBeUI7UUFDekIseUJBQXlCO1FBQ3pCLHlCQUF5QjtRQUN6QixpQ0FBaUM7UUFDakMsc0NBQXNDO1FBQ3RDLDBCQUEwQjtRQUMxQixpQ0FBaUM7UUFDakMsd0JBQXdCO1FBQ3hCLG9CQUFvQjtRQUNwQiw4QkFBOEI7UUFDOUIsOEJBQThCO1FBQzlCLDhCQUE4QjtRQUM5Qiw4QkFBOEI7UUFDOUIsOEJBQThCO1FBQzlCLDhCQUE4QjtRQUM5QiwrQkFBK0I7UUFDL0IsNkJBQTZCO1FBQzdCLCtCQUErQjtRQUMvQiwrQkFBK0I7UUFDL0IsK0JBQStCO1FBQy9CLDZCQUE2QjtRQUM3Qiw2QkFBNkI7UUFDN0IsNkJBQTZCO1FBQzdCLDZCQUE2QjtRQUM3Qiw2QkFBNkI7UUFDN0Isd0JBQXdCO1FBQ3hCLHVCQUF1QjtRQUN2Qix5QkFBeUI7UUFDekIscUJBQXFCO1FBQ3JCLGdDQUFnQztRQUNoQyxzQkFBc0I7UUFDdEIsd0JBQXdCO1FBQ3hCLHNCQUFzQjtRQUN0Qix3QkFBd0I7UUFDeEIsK0JBQStCO1FBQy9CLDBCQUEwQjtRQUMxQiwyQkFBMkI7UUFDM0IsOEJBQThCO1FBQzlCLHdCQUF3QjtRQUN4QixvQkFBb0I7UUFDcEIsK0JBQStCO1FBQy9CLHNCQUFzQjtRQUN0QixxQkFBcUI7UUFDckIsNkJBQTZCO1FBQzdCLDZCQUE2QjtRQUM3QiwrQkFBK0I7UUFDL0IsNEJBQTRCO1FBQzVCLDZCQUE2QjtRQUM3Qiw0QkFBNEI7UUFDNUIsNEJBQTRCO1FBQzVCLDRCQUE0QjtRQUM1Qiw4QkFBOEI7UUFDOUIseUJBQXlCO1FBQ3pCLHVDQUF1QztRQUN2Qyw0QkFBNEI7UUFDNUIsMEJBQTBCO1FBQzFCLG9DQUFvQztRQUNwQyxxQ0FBcUM7UUFDckMscUNBQXFDO1FBQ3JDLHFDQUFxQztRQUNyQyxxQ0FBcUM7UUFDckMscUJBQXFCO1FBQ3JCLGdDQUFnQztRQUNoQywyQkFBMkI7UUFDM0IsdUJBQXVCO1FBQ3ZCLCtCQUErQjtRQUMvQiw4QkFBOEI7UUFDOUIsNkJBQTZCO1FBQzdCLHVCQUF1QjtRQUN2QixrQ0FBa0M7UUFDbEMsc0JBQXNCO1FBQ3RCLDRCQUE0QjtRQUM1QiwwQkFBMEI7UUFDMUIsZ0NBQWdDO1FBQ2hDLGdCQUFnQjtRQUNoQixXQUFXO0tBQ1g7SUFDRCxTQUFTLEVBQUU7UUFDVixpQkFBaUI7UUFDakIscUJBQXFCO1FBQ3JCLGdDQUFnQztRQUNoQyxhQUFhO1FBQ2Isb0JBQW9CO1FBQ3BCLGlCQUFpQjtRQUNqQixjQUFjO1FBQ2QsZ0JBQWdCO1FBQ2hCLGdCQUFnQjtRQUNoQixnQkFBZ0I7UUFDaEIsMEJBQTBCO1FBQzFCLCtCQUErQjtRQUMvQixpQkFBaUI7UUFDakIsd0JBQXdCO1FBQ3hCLGVBQWU7UUFDZixXQUFXO1FBQ1gsdUJBQXVCO1FBQ3ZCLHVCQUF1QjtRQUN2Qix1QkFBdUI7UUFDdkIsdUJBQXVCO1FBQ3ZCLHVCQUF1QjtRQUN2Qix1QkFBdUI7UUFDdkIsdUJBQXVCO1FBQ3ZCLHNCQUFzQjtRQUN0QixzQkFBc0I7UUFDdEIsc0JBQXNCO1FBQ3RCLHNCQUFzQjtRQUN0QixzQkFBc0I7UUFDdEIsZUFBZTtRQUNmLHVCQUF1QjtRQUN2QixnQkFBZ0I7UUFDaEIsWUFBWTtRQUNaLHVCQUF1QjtRQUN2QixhQUFhO1FBQ2IsZUFBZTtRQUNmLGFBQWE7UUFDYixlQUFlO1FBQ2Ysd0JBQXdCO1FBQ3hCLHdCQUF3QjtRQUN4QixpQkFBaUI7UUFDakIsa0JBQWtCO1FBQ2xCLHFCQUFxQjtRQUNyQixlQUFlO1FBQ2Ysd0JBQXdCO1FBQ3hCLFdBQVc7UUFDWCxzQkFBc0I7UUFDdEIsYUFBYTtRQUNiLFlBQVk7UUFDWixzQkFBc0I7UUFDdEIsc0JBQXNCO1FBQ3RCLHdCQUF3QjtRQUN4QixxQkFBcUI7UUFDckIsc0JBQXNCO1FBQ3RCLDZCQUE2QjtRQUM3QixxQkFBcUI7UUFDckIscUJBQXFCO1FBQ3JCLHFCQUFxQjtRQUNyQix1QkFBdUI7UUFDdkIsZ0JBQWdCO1FBQ2hCLGdDQUFnQztRQUNoQyxtQkFBbUI7UUFDbkIsaUJBQWlCO1FBQ2pCLDZCQUE2QjtRQUM3Qiw0QkFBNEI7UUFDNUIsWUFBWTtRQUNaLHVCQUF1QjtRQUN2QixrQkFBa0I7UUFDbEIsY0FBYztRQUNkLHdCQUF3QjtRQUN4Qix1QkFBdUI7UUFDdkIsNkJBQTZCO1FBQzdCLGdCQUFnQjtRQUNoQiw0QkFBNEI7UUFDNUIsOEJBQThCO1FBQzlCLDhCQUE4QjtRQUM5Qiw4QkFBOEI7UUFDOUIsa0NBQWtDO1FBQ2xDLDZCQUE2QjtRQUM3QixnQ0FBZ0M7UUFDaEMsZ0NBQWdDO1FBQ2hDLGdDQUFnQztRQUNoQyxnQ0FBZ0M7UUFDaEMsZ0NBQWdDO1FBQ2hDLGdDQUFnQztRQUNoQyxnQ0FBZ0M7UUFDaEMsZ0NBQWdDO1FBQ2hDLCtCQUErQjtRQUMvQiwrQkFBK0I7UUFDL0IsY0FBYztRQUNkLHlCQUF5QjtRQUN6QixhQUFhO1FBQ2IsbUJBQW1CO1FBQ25CLGlCQUFpQjtRQUNqQixnQ0FBZ0M7UUFDaEMsZ0JBQWdCO1FBQ2hCLFdBQVc7S0FDWDtJQUNELFNBQVMsRUFBRTtRQUNWLGlCQUFpQjtRQUNqQixnQ0FBZ0M7UUFDaEMsMENBQTBDO1FBQzFDLHNCQUFzQjtRQUN0Qiw2QkFBNkI7UUFDN0IsMEJBQTBCO1FBQzFCLHVCQUF1QjtRQUN2Qix5QkFBeUI7UUFDekIseUJBQXlCO1FBQ3pCLHlCQUF5QjtRQUN6QixpQ0FBaUM7UUFDakMsc0NBQXNDO1FBQ3RDLDBCQUEwQjtRQUMxQixpQ0FBaUM7UUFDakMsd0JBQXdCO1FBQ3hCLG9CQUFvQjtRQUNwQiw4QkFBOEI7UUFDOUIsOEJBQThCO1FBQzlCLDhCQUE4QjtRQUM5Qix3QkFBd0I7UUFDeEIsdUJBQXVCO1FBQ3ZCLHlCQUF5QjtRQUN6QixvQ0FBb0M7UUFDcEMscUJBQXFCO1FBQ3JCLCtCQUErQjtRQUMvQixzQkFBc0I7UUFDdEIsd0JBQXdCO1FBQ3hCLHNCQUFzQjtRQUN0Qix3QkFBd0I7UUFDeEIsK0JBQStCO1FBQy9CLGlDQUFpQztRQUNqQyxpQ0FBaUM7UUFDakMsMEJBQTBCO1FBQzFCLDJCQUEyQjtRQUMzQiw4QkFBOEI7UUFDOUIsd0JBQXdCO1FBQ3hCLG9CQUFvQjtRQUNwQiw4QkFBOEI7UUFDOUIsc0JBQXNCO1FBQ3RCLHFCQUFxQjtRQUNyQiw2QkFBNkI7UUFDN0IsNkJBQTZCO1FBQzdCLCtCQUErQjtRQUMvQiw0QkFBNEI7UUFDNUIsNkJBQTZCO1FBQzdCLDRCQUE0QjtRQUM1Qiw0QkFBNEI7UUFDNUIsNEJBQTRCO1FBQzVCLDhCQUE4QjtRQUM5Qix5QkFBeUI7UUFDekIsdUNBQXVDO1FBQ3ZDLDRCQUE0QjtRQUM1QiwwQkFBMEI7UUFDMUIsb0NBQW9DO1FBQ3BDLHFCQUFxQjtRQUNyQiwrQkFBK0I7UUFDL0IsMkJBQTJCO1FBQzNCLHVCQUF1QjtRQUN2QiwrQkFBK0I7UUFDL0IsOEJBQThCO1FBQzlCLDZCQUE2QjtRQUM3Qix5QkFBeUI7UUFDekIsbUNBQW1DO1FBQ25DLHFDQUFxQztRQUNyQyxxQ0FBcUM7UUFDckMscUNBQXFDO1FBQ3JDLG9DQUFvQztRQUNwQyx1Q0FBdUM7UUFDdkMsdUNBQXVDO1FBQ3ZDLHVDQUF1QztRQUN2Qyx1Q0FBdUM7UUFDdkMsdUNBQXVDO1FBQ3ZDLHVDQUF1QztRQUN2Qyx1Q0FBdUM7UUFDdkMsdUNBQXVDO1FBQ3ZDLHNDQUFzQztRQUN0QyxzQ0FBc0M7UUFDdEMsdUJBQXVCO1FBQ3ZCLGlDQUFpQztRQUNqQyxzQkFBc0I7UUFDdEIsNEJBQTRCO1FBQzVCLG1DQUFtQztRQUNuQywwQkFBMEI7UUFDMUIsZ0NBQWdDO1FBQ2hDLGdCQUFnQjtRQUNoQixXQUFXO0tBQ1g7Q0FDRCxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwLWxpc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGVwLWxpc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBRWhHLCtHQUErRztBQUMvRywrREFBK0Q7QUFDbEQsUUFBQSxjQUFjLEdBQUc7SUFDN0IsaUJBQWlCO0lBQ2pCLHdCQUF3QjtJQUN4Qiw2QkFBNkI7SUFDN0IsNkJBQTZCO0lBQzdCLGdDQUFnQztJQUNoQyx5QkFBeUI7SUFDekIsdUJBQXVCO0lBQ3ZCLFdBQVcsQ0FBQyxpQkFBaUI7Q0FDN0IsQ0FBQztBQUVXLFFBQUEsNEJBQTRCLEdBQUc7SUFDM0MsUUFBUSxFQUFFO1FBQ1QsaUJBQWlCO1FBQ2pCLCtCQUErQjtRQUMvQiwwQ0FBMEM7UUFDMUMsd0NBQXdDO1FBQ3hDLHNCQUFzQjtRQUN0Qiw2QkFBNkI7UUFDN0IsMEJBQTBCO1FBQzFCLHVCQUF1QjtRQUN2Qix5QkFBeUI7UUFDekIseUJBQXlCO1FBQ3pCLHlCQUF5QjtRQUN6QixpQ0FBaUM7UUFDakMsc0NBQXNDO1FBQ3RDLDBCQUEwQjtRQUMxQixpQ0FBaUM7UUFDakMsd0JBQXdCO1FBQ3hCLG9CQUFvQjtRQUNwQiw4QkFBOEI7UUFDOUIsOEJBQThCO1FBQzlCLDhCQUE4QjtRQUM5Qiw4QkFBOEI7UUFDOUIsOEJBQThCO1FBQzlCLDhCQUE4QjtRQUM5QiwrQkFBK0I7UUFDL0IsNkJBQTZCO1FBQzdCLCtCQUErQjtRQUMvQiwrQkFBK0I7UUFDL0IsK0JBQStCO1FBQy9CLDZCQUE2QjtRQUM3Qiw2QkFBNkI7UUFDN0IsNkJBQTZCO1FBQzdCLDZCQUE2QjtRQUM3Qiw2QkFBNkI7UUFDN0Isd0JBQXdCO1FBQ3hCLHVCQUF1QjtRQUN2Qix5QkFBeUI7UUFDekIscUJBQXFCO1FBQ3JCLGdDQUFnQztRQUNoQyxzQkFBc0I7UUFDdEIsd0JBQXdCO1FBQ3hCLHNCQUFzQjtRQUN0Qix3QkFBd0I7UUFDeEIsK0JBQStCO1FBQy9CLDBCQUEwQjtRQUMxQiwyQkFBMkI7UUFDM0IsOEJBQThCO1FBQzlCLDhCQUE4QjtRQUM5QiwrQ0FBK0M7UUFDL0Msd0JBQXdCO1FBQ3hCLHVCQUF1QjtRQUN2QixpQ0FBaUM7UUFDakMsb0JBQW9CO1FBQ3BCLCtCQUErQjtRQUMvQixzQkFBc0I7UUFDdEIscUJBQXFCO1FBQ3JCLDZCQUE2QjtRQUM3Qiw2QkFBNkI7UUFDN0IsK0JBQStCO1FBQy9CLDRCQUE0QjtRQUM1Qiw2QkFBNkI7UUFDN0IsNEJBQTRCO1FBQzVCLDRCQUE0QjtRQUM1Qiw0QkFBNEI7UUFDNUIsOEJBQThCO1FBQzlCLHlCQUF5QjtRQUN6Qix1Q0FBdUM7UUFDdkMsNEJBQTRCO1FBQzVCLDBCQUEwQjtRQUMxQixvQ0FBb0M7UUFDcEMscUNBQXFDO1FBQ3JDLHFDQUFxQztRQUNyQyxxQ0FBcUM7UUFDckMscUNBQXFDO1FBQ3JDLHFCQUFxQjtRQUNyQixnQ0FBZ0M7UUFDaEMsMkJBQTJCO1FBQzNCLHVCQUF1QjtRQUN2QiwrQkFBK0I7UUFDL0IsOEJBQThCO1FBQzlCLDZCQUE2QjtRQUM3Qix1QkFBdUI7UUFDdkIsa0NBQWtDO1FBQ2xDLHNCQUFzQjtRQUN0Qiw0QkFBNEI7UUFDNUIsMEJBQTBCO1FBQzFCLGdDQUFnQztRQUNoQyxnQkFBZ0I7UUFDaEIsV0FBVztLQUNYO0lBQ0QsU0FBUyxFQUFFO1FBQ1YsaUJBQWlCO1FBQ2pCLHFCQUFxQjtRQUNyQixnQ0FBZ0M7UUFDaEMsYUFBYTtRQUNiLG9CQUFvQjtRQUNwQixpQkFBaUI7UUFDakIsY0FBYztRQUNkLGdCQUFnQjtRQUNoQixnQkFBZ0I7UUFDaEIsZ0JBQWdCO1FBQ2hCLDBCQUEwQjtRQUMxQiwrQkFBK0I7UUFDL0IsaUJBQWlCO1FBQ2pCLHdCQUF3QjtRQUN4QixlQUFlO1FBQ2YsV0FBVztRQUNYLHVCQUF1QjtRQUN2Qix1QkFBdUI7UUFDdkIsdUJBQXVCO1FBQ3ZCLHVCQUF1QjtRQUN2Qix1QkFBdUI7UUFDdkIsc0JBQXNCO1FBQ3RCLHNCQUFzQjtRQUN0QixzQkFBc0I7UUFDdEIsc0JBQXNCO1FBQ3RCLHNCQUFzQjtRQUN0QixlQUFlO1FBQ2YsdUJBQXVCO1FBQ3ZCLGdCQUFnQjtRQUNoQixZQUFZO1FBQ1osdUJBQXVCO1FBQ3ZCLGFBQWE7UUFDYixlQUFlO1FBQ2YsYUFBYTtRQUNiLGVBQWU7UUFDZix3QkFBd0I7UUFDeEIsd0JBQXdCO1FBQ3hCLGlCQUFpQjtRQUNqQixrQkFBa0I7UUFDbEIscUJBQXFCO1FBQ3JCLHFCQUFxQjtRQUNyQix3Q0FBd0M7UUFDeEMsZUFBZTtRQUNmLHdCQUF3QjtRQUN4QixjQUFjO1FBQ2QsMEJBQTBCO1FBQzFCLFdBQVc7UUFDWCxzQkFBc0I7UUFDdEIsYUFBYTtRQUNiLFlBQVk7UUFDWixzQkFBc0I7UUFDdEIsc0JBQXNCO1FBQ3RCLHdCQUF3QjtRQUN4QixxQkFBcUI7UUFDckIsc0JBQXNCO1FBQ3RCLDZCQUE2QjtRQUM3QixxQkFBcUI7UUFDckIscUJBQXFCO1FBQ3JCLHFCQUFxQjtRQUNyQix1QkFBdUI7UUFDdkIsZ0JBQWdCO1FBQ2hCLGdDQUFnQztRQUNoQyxtQkFBbUI7UUFDbkIsaUJBQWlCO1FBQ2pCLDZCQUE2QjtRQUM3Qiw0QkFBNEI7UUFDNUIsWUFBWTtRQUNaLHVCQUF1QjtRQUN2QixrQkFBa0I7UUFDbEIsY0FBYztRQUNkLHdCQUF3QjtRQUN4Qix1QkFBdUI7UUFDdkIsNkJBQTZCO1FBQzdCLGdCQUFnQjtRQUNoQiw0QkFBNEI7UUFDNUIsOEJBQThCO1FBQzlCLDhCQUE4QjtRQUM5Qiw4QkFBOEI7UUFDOUIsa0NBQWtDO1FBQ2xDLDZCQUE2QjtRQUM3QixnQ0FBZ0M7UUFDaEMsZ0NBQWdDO1FBQ2hDLGdDQUFnQztRQUNoQyxnQ0FBZ0M7UUFDaEMsZ0NBQWdDO1FBQ2hDLGdDQUFnQztRQUNoQyxnQ0FBZ0M7UUFDaEMsZ0NBQWdDO1FBQ2hDLCtCQUErQjtRQUMvQiwrQkFBK0I7UUFDL0IsY0FBYztRQUNkLHlCQUF5QjtRQUN6QixhQUFhO1FBQ2IsbUJBQW1CO1FBQ25CLGlCQUFpQjtRQUNqQixnQ0FBZ0M7UUFDaEMsZ0JBQWdCO1FBQ2hCLFdBQVc7S0FDWDtJQUNELFNBQVMsRUFBRTtRQUNWLGlCQUFpQjtRQUNqQixnQ0FBZ0M7UUFDaEMsMENBQTBDO1FBQzFDLHNCQUFzQjtRQUN0Qiw2QkFBNkI7UUFDN0IsMEJBQTBCO1FBQzFCLHVCQUF1QjtRQUN2Qix5QkFBeUI7UUFDekIseUJBQXlCO1FBQ3pCLHlCQUF5QjtRQUN6QixpQ0FBaUM7UUFDakMsc0NBQXNDO1FBQ3RDLDBCQUEwQjtRQUMxQixpQ0FBaUM7UUFDakMsd0JBQXdCO1FBQ3hCLG9CQUFvQjtRQUNwQiw4QkFBOEI7UUFDOUIsd0JBQXdCO1FBQ3hCLHVCQUF1QjtRQUN2Qix5QkFBeUI7UUFDekIsb0NBQW9DO1FBQ3BDLHFCQUFxQjtRQUNyQiwrQkFBK0I7UUFDL0Isc0JBQXNCO1FBQ3RCLHdCQUF3QjtRQUN4QixzQkFBc0I7UUFDdEIsd0JBQXdCO1FBQ3hCLCtCQUErQjtRQUMvQixpQ0FBaUM7UUFDakMsaUNBQWlDO1FBQ2pDLDBCQUEwQjtRQUMxQiwyQkFBMkI7UUFDM0IsOEJBQThCO1FBQzlCLDhCQUE4QjtRQUM5QiwrQ0FBK0M7UUFDL0Msd0JBQXdCO1FBQ3hCLHVCQUF1QjtRQUN2QixpQ0FBaUM7UUFDakMsb0JBQW9CO1FBQ3BCLDhCQUE4QjtRQUM5QixzQkFBc0I7UUFDdEIscUJBQXFCO1FBQ3JCLDZCQUE2QjtRQUM3Qiw2QkFBNkI7UUFDN0IsK0JBQStCO1FBQy9CLDRCQUE0QjtRQUM1Qiw2QkFBNkI7UUFDN0IsNEJBQTRCO1FBQzVCLDRCQUE0QjtRQUM1Qiw0QkFBNEI7UUFDNUIsOEJBQThCO1FBQzlCLHlCQUF5QjtRQUN6Qix1Q0FBdUM7UUFDdkMsNEJBQTRCO1FBQzVCLDBCQUEwQjtRQUMxQixvQ0FBb0M7UUFDcEMscUJBQXFCO1FBQ3JCLCtCQUErQjtRQUMvQiwyQkFBMkI7UUFDM0IsdUJBQXVCO1FBQ3ZCLCtCQUErQjtRQUMvQiw4QkFBOEI7UUFDOUIsNkJBQTZCO1FBQzdCLHlCQUF5QjtRQUN6QixtQ0FBbUM7UUFDbkMscUNBQXFDO1FBQ3JDLHFDQUFxQztRQUNyQyxxQ0FBcUM7UUFDckMsb0NBQW9DO1FBQ3BDLHVDQUF1QztRQUN2Qyx1Q0FBdUM7UUFDdkMsdUNBQXVDO1FBQ3ZDLHVDQUF1QztRQUN2Qyx1Q0FBdUM7UUFDdkMsdUNBQXVDO1FBQ3ZDLHVDQUF1QztRQUN2Qyx1Q0FBdUM7UUFDdkMsc0NBQXNDO1FBQ3RDLHNDQUFzQztRQUN0Qyx1QkFBdUI7UUFDdkIsaUNBQWlDO1FBQ2pDLHNCQUFzQjtRQUN0Qiw0QkFBNEI7UUFDNUIsbUNBQW1DO1FBQ25DLDBCQUEwQjtRQUMxQixnQ0FBZ0M7UUFDaEMsZ0JBQWdCO1FBQ2hCLFdBQVc7S0FDWDtDQUNELENBQUMifQ== \ No newline at end of file diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts index ad7c2db4f4a..2424efc6cb8 100644 --- a/build/linux/rpm/dep-lists.ts +++ b/build/linux/rpm/dep-lists.ts @@ -64,7 +64,11 @@ export const referenceGeneratedDepsByArch = { 'libgio-2.0.so.0()(64bit)', 'libglib-2.0.so.0()(64bit)', 'libgobject-2.0.so.0()(64bit)', + 'libgssapi_krb5.so.2()(64bit)', + 'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)', 'libgtk-3.so.0()(64bit)', + 'libkrb5.so.3()(64bit)', + 'libkrb5.so.3(krb5_3_MIT)(64bit)', 'libm.so.6()(64bit)', 'libm.so.6(GLIBC_2.2.5)(64bit)', 'libnspr4.so()(64bit)', @@ -125,8 +129,6 @@ export const referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.15)', 'libc.so.6(GLIBC_2.16)', 'libc.so.6(GLIBC_2.17)', - 'libc.so.6(GLIBC_2.25)', - 'libc.so.6(GLIBC_2.28)', 'libc.so.6(GLIBC_2.4)', 'libc.so.6(GLIBC_2.6)', 'libc.so.6(GLIBC_2.7)', @@ -146,8 +148,12 @@ export const referenceGeneratedDepsByArch = { 'libgio-2.0.so.0', 'libglib-2.0.so.0', 'libgobject-2.0.so.0', + 'libgssapi_krb5.so.2', + 'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)', 'libgtk-3.so.0', 'libgtk-3.so.0()(64bit)', + 'libkrb5.so.3', + 'libkrb5.so.3(krb5_3_MIT)', 'libm.so.6', 'libm.so.6(GLIBC_2.4)', 'libnspr4.so', @@ -219,8 +225,6 @@ export const referenceGeneratedDepsByArch = { 'libatspi.so.0()(64bit)', 'libc.so.6()(64bit)', 'libc.so.6(GLIBC_2.17)(64bit)', - 'libc.so.6(GLIBC_2.25)(64bit)', - 'libc.so.6(GLIBC_2.28)(64bit)', 'libcairo.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', @@ -237,7 +241,11 @@ export const referenceGeneratedDepsByArch = { 'libgio-2.0.so.0()(64bit)', 'libglib-2.0.so.0()(64bit)', 'libgobject-2.0.so.0()(64bit)', + 'libgssapi_krb5.so.2()(64bit)', + 'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)', 'libgtk-3.so.0()(64bit)', + 'libkrb5.so.3()(64bit)', + 'libkrb5.so.3(krb5_3_MIT)(64bit)', 'libm.so.6()(64bit)', 'libm.so.6(GLIBC_2.17)(64bit)', 'libnspr4.so()(64bit)', diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe index 37f23486ca0..ff4febe8ce6 100644 --- a/build/monaco/monaco.d.ts.recipe +++ b/build/monaco/monaco.d.ts.recipe @@ -14,10 +14,45 @@ declare namespace monaco { export type Thenable = PromiseLike; export interface Environment { + /** + * Define a global `monaco` symbol. + * This is true by default in AMD and false by default in ESM. + */ globalAPI?: boolean; + /** + * The base url where the editor sources are found (which contains the vs folder) + */ baseUrl?: string; + /** + * A web worker factory. + * NOTE: If `getWorker` is defined, `getWorkerUrl` is not invoked. + */ getWorker?(workerId: string, label: string): Promise | Worker; + /** + * Return the location for web worker scripts. + * NOTE: If `getWorker` is defined, `getWorkerUrl` is not invoked. + */ getWorkerUrl?(workerId: string, label: string): string; + /** + * Create a trusted types policy (same API as window.trustedTypes.createPolicy) + */ + createTrustedTypesPolicy?( + policyName: string, + policyOptions?: ITrustedTypePolicyOptions, + ): undefined | ITrustedTypePolicy; + } + + export interface ITrustedTypePolicyOptions { + createHTML?: (input: string, ...arguments: any[]) => string; + createScript?: (input: string, ...arguments: any[]) => string; + createScriptURL?: (input: string, ...arguments: any[]) => string; + } + + export interface ITrustedTypePolicy { + readonly name: string; + createHTML?(input: string): any; + createScript?(input: string): any; + createScriptURL?(input: string): any; } export interface IDisposable { @@ -75,7 +110,7 @@ export interface ICommandHandler { #include(vs/editor/common/diff/smartLinesDiffComputer): IChange, ICharChange, ILineChange #include(vs/editor/common/diff/documentDiffProvider): IDocumentDiffProvider, IDocumentDiffProviderOptions, IDocumentDiff #include(vs/editor/common/core/lineRange): LineRange -#include(vs/editor/common/diff/linesDiffComputer): LineRangeMapping, RangeMapping +#include(vs/editor/common/diff/linesDiffComputer): LineRangeMapping, RangeMapping, MovedText, SimpleLineRangeMapping #include(vs/editor/common/core/dimension): IDimension #includeAll(vs/editor/common/editorCommon): IScrollEvent #includeAll(vs/editor/common/textModelEvents): diff --git a/build/npm/gyp/package.json b/build/npm/gyp/package.json index 0efaa499b9d..3961e955a5f 100644 --- a/build/npm/gyp/package.json +++ b/build/npm/gyp/package.json @@ -4,7 +4,7 @@ "private": true, "license": "MIT", "devDependencies": { - "node-gyp": "^8.4.1" + "node-gyp": "^9.4.0" }, "scripts": {} } diff --git a/build/npm/gyp/patches/gyp_spectre_mitigation_support.patch b/build/npm/gyp/patches/gyp_spectre_mitigation_support.patch new file mode 100644 index 00000000000..e64f42e2b04 --- /dev/null +++ b/build/npm/gyp/patches/gyp_spectre_mitigation_support.patch @@ -0,0 +1,51 @@ +From 853e4643b6737224a5aa0720a4108461a0230991 Mon Sep 17 00:00:00 2001 +From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> +Date: Thu, 30 Mar 2023 05:23:36 -0700 +Subject: [PATCH] feat(msvs): add SpectreMitigation attribute (#190) + +Backports https://github.com/nodejs/gyp-next/commit/853e4643b6737224a5aa0720a4108461a0230991 + +diff --git a/gyp/pylib/gyp/easy_xml_test.py b/gyp/pylib/gyp/easy_xml_test.py +index 342f693..c5808b8 100755 +--- a/gyp/pylib/gyp/easy_xml_test.py ++++ b/gyp/pylib/gyp/easy_xml_test.py +@@ -76,6 +76,7 @@ def test_EasyXml_complex(self): + '\'Debug|Win32\'" Label="Configuration">' + "Application" + "Unicode" ++ "SpectreLoadCF" + "" + "" + ) +@@ -99,6 +100,7 @@ def test_EasyXml_complex(self): + }, + ["ConfigurationType", "Application"], + ["CharacterSet", "Unicode"], ++ ["SpectreMitigation", "SpectreLoadCF"] + ], + ] + ) +diff --git a/gyp/pylib/gyp/generator/msvs.py b/gyp/pylib/gyp/generator/msvs.py +index 72269bd..85c354f 100644 +--- a/gyp/pylib/gyp/generator/msvs.py ++++ b/gyp/pylib/gyp/generator/msvs.py +@@ -3006,6 +3006,10 @@ def _GetMSBuildConfigurationDetails(spec, build_file): + character_set = msbuild_attributes.get("CharacterSet") + config_type = msbuild_attributes.get("ConfigurationType") + _AddConditionalProperty(properties, condition, "ConfigurationType", config_type) ++ spectre_mitigation = msbuild_attributes.get('SpectreMitigation') ++ if spectre_mitigation: ++ _AddConditionalProperty(properties, condition, "SpectreMitigation", ++ spectre_mitigation) + if config_type == "Driver": + _AddConditionalProperty(properties, condition, "DriverType", "WDM") + _AddConditionalProperty( +@@ -3094,6 +3098,8 @@ def _ConvertMSVSBuildAttributes(spec, config, build_file): + msbuild_attributes[a] = _ConvertMSVSCharacterSet(msvs_attributes[a]) + elif a == "ConfigurationType": + msbuild_attributes[a] = _ConvertMSVSConfigurationType(msvs_attributes[a]) ++ elif a == "SpectreMitigation": ++ msbuild_attributes[a] = msvs_attributes[a] + else: + print("Warning: Do not know how to convert MSVS attribute " + a) + return msbuild_attributes diff --git a/build/npm/gyp/yarn.lock b/build/npm/gyp/yarn.lock index d5d6bced114..3716071611c 100644 --- a/build/npm/gyp/yarn.lock +++ b/build/npm/gyp/yarn.lock @@ -2,33 +2,36 @@ # yarn lockfile v1 -"@gar/promisify@^1.0.1": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" - integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" -"@npmcli/fs@^1.0.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257" - integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ== +"@npmcli/fs@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e" + integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w== dependencies: - "@gar/promisify" "^1.0.1" semver "^7.3.5" -"@npmcli/move-file@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" - integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== - dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -abbrev@1: +abbrev@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== @@ -40,13 +43,13 @@ agent-base@6, agent-base@^6.0.2: dependencies: debug "4" -agentkeepalive@^4.1.3: - version "4.2.1" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" - integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== +agentkeepalive@^4.2.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255" + integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg== dependencies: debug "^4.1.0" - depd "^1.1.2" + depd "^2.0.0" humanize-ms "^1.2.1" aggregate-error@^3.0.0: @@ -62,6 +65,23 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +ansi-regex@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== + +ansi-styles@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + "aproba@^1.0.3 || ^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" @@ -88,29 +108,30 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -cacache@^15.2.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" - integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== dependencies: - "@npmcli/fs" "^1.0.0" - "@npmcli/move-file" "^1.0.1" - chownr "^2.0.0" - fs-minipass "^2.0.0" - glob "^7.1.4" - infer-owner "^1.0.4" - lru-cache "^6.0.0" - minipass "^3.1.1" + balanced-match "^1.0.0" + +cacache@^17.0.0: + version "17.1.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.3.tgz#c6ac23bec56516a7c0c52020fd48b4909d7c7044" + integrity sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg== + dependencies: + "@npmcli/fs" "^3.1.0" + fs-minipass "^3.0.0" + glob "^10.2.2" + lru-cache "^7.7.1" + minipass "^5.0.0" minipass-collect "^1.0.2" minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^1.0.3" + minipass-pipeline "^1.2.4" p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.0.2" - unique-filename "^1.1.1" + ssri "^10.0.0" + tar "^6.1.11" + unique-filename "^3.0.0" chownr@^2.0.0: version "2.0.0" @@ -122,6 +143,18 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" @@ -137,6 +170,15 @@ console-control-strings@^1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== +cross-spawn@^7.0.0: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + debug@4, debug@^4.1.0, debug@^4.3.3: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -149,17 +191,27 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== -depd@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== +depd@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -encoding@^0.1.12: +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + +encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -176,6 +228,19 @@ err-code@^2.0.2: resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== +exponential-backoff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6" + integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== + +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -183,6 +248,13 @@ fs-minipass@^2.0.0: dependencies: minipass "^3.0.0" +fs-minipass@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.2.tgz#5b383858efa8c1eb8c33b39e994f7e8555b8b3a3" + integrity sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g== + dependencies: + minipass "^5.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -202,6 +274,17 @@ gauge@^4.0.3: strip-ansi "^6.0.1" wide-align "^1.1.5" +glob@^10.2.2: + version "10.3.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.3.tgz#8360a4ffdd6ed90df84aa8d52f21f452e86a123b" + integrity sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.0.3" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" + glob@^7.1.3, glob@^7.1.4: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -224,17 +307,17 @@ has-unicode@^2.0.1: resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== -http-cache-semantics@^4.1.0: +http-cache-semantics@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== dependencies: - "@tootallnate/once" "1" + "@tootallnate/once" "2" agent-base "6" debug "4" @@ -270,11 +353,6 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== -infer-owner@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -308,6 +386,15 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== +jackspeak@^2.0.3: + version "2.2.2" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.2.2.tgz#707c62733924b8dc2a0a629dc6248577788b5385" + integrity sha512-mgNtVv4vUuaKA97yxUHoA3+FkuhtxkjdXEWOyB/N76fjy0FjezEt34oy3epBtvCvS+7DyKwqCFWx/oJLV5+kCg== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -315,27 +402,36 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -make-fetch-happen@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" - integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== +lru-cache@^7.7.1: + version "7.18.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" + integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== + +"lru-cache@^9.1.1 || ^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61" + integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw== + +make-fetch-happen@^11.0.3: + version "11.1.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f" + integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w== dependencies: - agentkeepalive "^4.1.3" - cacache "^15.2.0" - http-cache-semantics "^4.1.0" - http-proxy-agent "^4.0.1" + agentkeepalive "^4.2.1" + cacache "^17.0.0" + http-cache-semantics "^4.1.1" + http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" is-lambda "^1.0.1" - lru-cache "^6.0.0" - minipass "^3.1.3" - minipass-collect "^1.0.2" - minipass-fetch "^1.3.2" + lru-cache "^7.7.1" + minipass "^5.0.0" + minipass-fetch "^3.0.0" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" - negotiator "^0.6.2" + negotiator "^0.6.3" promise-retry "^2.0.1" - socks-proxy-agent "^6.0.0" - ssri "^8.0.0" + socks-proxy-agent "^7.0.0" + ssri "^10.0.0" minimatch@^3.1.1: version "3.1.2" @@ -344,6 +440,13 @@ minimatch@^3.1.1: dependencies: brace-expansion "^1.1.7" +minimatch@^9.0.1: + version "9.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" @@ -351,16 +454,16 @@ minipass-collect@^1.0.2: dependencies: minipass "^3.0.0" -minipass-fetch@^1.3.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6" - integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw== +minipass-fetch@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.3.tgz#d9df70085609864331b533c960fd4ffaa78d15ce" + integrity sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ== dependencies: - minipass "^3.1.0" + minipass "^5.0.0" minipass-sized "^1.0.3" - minizlib "^2.0.0" + minizlib "^2.1.2" optionalDependencies: - encoding "^0.1.12" + encoding "^0.1.13" minipass-flush@^1.0.5: version "1.0.5" @@ -369,7 +472,7 @@ minipass-flush@^1.0.5: dependencies: minipass "^3.0.0" -minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: +minipass-pipeline@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== @@ -383,7 +486,7 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: +minipass@^3.0.0: version "3.3.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== @@ -395,7 +498,17 @@ minipass@^4.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.3.tgz#00bfbaf1e16e35e804f4aa31a7c1f6b8d9f0ee72" integrity sha512-OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw== -minizlib@^2.0.0, minizlib@^2.1.1: +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.0.2" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz#58a82b7d81c7010da5bd4b2c0c85ac4b4ec5131e" + integrity sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA== + +minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -403,7 +516,7 @@ minizlib@^2.0.0, minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" -mkdirp@^1.0.3, mkdirp@^1.0.4: +mkdirp@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -418,33 +531,34 @@ ms@^2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -negotiator@^0.6.2: +negotiator@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -node-gyp@^8.4.1: - version "8.4.1" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" - integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w== +node-gyp@^9.4.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz#2a7a91c7cba4eccfd95e949369f27c9ba704f369" + integrity sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg== dependencies: env-paths "^2.2.0" + exponential-backoff "^3.1.1" glob "^7.1.4" graceful-fs "^4.2.6" - make-fetch-happen "^9.1.0" - nopt "^5.0.0" + make-fetch-happen "^11.0.3" + nopt "^6.0.0" npmlog "^6.0.0" rimraf "^3.0.2" semver "^7.3.5" tar "^6.1.2" which "^2.0.2" -nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== +nopt@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" + integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== dependencies: - abbrev "1" + abbrev "^1.0.0" npmlog@^6.0.0: version "6.0.2" @@ -475,10 +589,18 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== +path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-scurry@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" + integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== + dependencies: + lru-cache "^9.1.1 || ^10.0.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" promise-retry@^2.0.1: version "2.0.1" @@ -520,9 +642,9 @@ safe-buffer@~5.2.0: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== semver@^7.3.5: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" @@ -531,20 +653,37 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -socks-proxy-agent@^6.0.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce" - integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ== +socks-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" + integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== dependencies: agent-base "^6.0.2" debug "^4.3.3" @@ -558,14 +697,14 @@ socks@^2.6.2: ip "^2.0.0" smart-buffer "^4.2.0" -ssri@^8.0.0, ssri@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" - integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== +ssri@^10.0.0: + version "10.0.4" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.4.tgz#5a20af378be586df139ddb2dfb3bf992cf0daba6" + integrity sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ== dependencies: - minipass "^3.1.1" + minipass "^5.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -574,6 +713,15 @@ ssri@^8.0.0, ssri@^8.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string-width@^5.0.1, string-width@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" + string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -581,14 +729,33 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" -tar@^6.0.2, tar@^6.1.2: +strip-ansi@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + dependencies: + ansi-regex "^6.0.1" + +tar@^6.1.11: + version "6.1.15" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" + integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^5.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + +tar@^6.1.2: version "6.1.13" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== @@ -600,17 +767,17 @@ tar@^6.0.2, tar@^6.1.2: mkdirp "^1.0.3" yallist "^4.0.0" -unique-filename@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== +unique-filename@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea" + integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g== dependencies: - unique-slug "^2.0.0" + unique-slug "^4.0.0" -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== +unique-slug@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3" + integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ== dependencies: imurmurhash "^0.1.4" @@ -619,7 +786,7 @@ util-deprecate@^1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -which@^2.0.2: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== @@ -633,6 +800,24 @@ wide-align@^1.1.5: dependencies: string-width "^1.0.2 || 2 || 3 || 4" +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== + dependencies: + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js index d9280ffb1eb..09df602a3bf 100644 --- a/build/npm/postinstall.js +++ b/build/npm/postinstall.js @@ -53,7 +53,10 @@ function yarnInstall(dir, opts) { console.log(`Installing dependencies in ${dir} inside container ${process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME']}...`); opts.cwd = root; - run('docker', ['run', '-e', 'GITHUB_TOKEN', '-e', 'npm_config_arch', '-v', `/mnt/vss/_work/1/s:/root/vscode`, '-v', `/mnt/vss/_work/1/s/.build/.netrc:/root/.netrc`, process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'yarn', '--cwd', dir, ...args], opts); + if (process.env['npm_config_arch'] === 'arm64') { + run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], opts); + } + run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-e', 'npm_config_arch', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/root/vscode`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`, process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'yarn', '--cwd', dir, ...args], opts); run('sudo', ['chown', '-R', `${userinfo.uid}:${userinfo.gid}`, `${dir}/node_modules`], opts); } else { console.log(`Installing dependencies in ${dir}...`); diff --git a/build/npm/preinstall.js b/build/npm/preinstall.js index 79f2b629c5d..31d2a6d5c30 100644 --- a/build/npm/preinstall.js +++ b/build/npm/preinstall.js @@ -123,7 +123,19 @@ function installHeaders() { cp.execFileSync(node_gyp, ['install', '--dist-url', local.disturl, local.target]); } - if (remote !== undefined && !versions.has(remote.target)) { + // Avoid downloading headers for Windows arm64 till we move to Nodejs v19 in remote + // which is the first official release with support for the architecture. Downloading + // the headers for older versions now redirect to https://origin.nodejs.org/404.html + // which causes checksum validation error in node-gyp. + // + // gyp http 200 https://origin.nodejs.org/404.html + // gyp WARN install got an error, rolling back install + // gyp ERR! install error + // gyp ERR! stack Error: win-arm64/node.lib local checksum 4c62bed7a032f7b36984321b7ffdd60b596fac870672037ff879ae9ac9548fb7 not match remote undefined + // + if (remote !== undefined && !versions.has(remote.target) && + process.env['npm_config_arch'] !== "arm64" && + process.arch !== "arm64") { // Both disturl and target come from a file checked into our repository cp.execFileSync(node_gyp, ['install', '--dist-url', remote.disturl, remote.target]); } diff --git a/build/package.json b/build/package.json index f04e30cdae0..b1b42569425 100644 --- a/build/package.json +++ b/build/package.json @@ -36,6 +36,7 @@ "@types/through2": "^2.0.36", "@types/tmp": "^0.2.1", "@types/underscore": "^1.8.9", + "@types/workerpool": "^6.4.0", "@types/xml2js": "0.0.33", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/vsce": "^2.16.0", @@ -68,5 +69,8 @@ "tree-sitter": "https://github.com/joaomoreno/node-tree-sitter/releases/download/v0.20.0/tree-sitter-0.20.0.tgz", "tree-sitter-typescript": "^0.20.1", "vscode-gulp-watch": "^5.0.3" + }, + "dependencies": { + "workerpool": "^6.4.0" } } diff --git a/build/win32/Cargo.lock b/build/win32/Cargo.lock index 0601c70fb9e..fb521755690 100644 --- a/build/win32/Cargo.lock +++ b/build/win32/Cargo.lock @@ -19,12 +19,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "build_const" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7" - [[package]] name = "byteorder" version = "1.4.3" @@ -39,13 +33,19 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "crc" -version = "1.8.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" dependencies = [ - "build_const", + "crc-catalog", ] +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + [[package]] name = "crossbeam-channel" version = "0.5.5" @@ -109,14 +109,14 @@ dependencies = [ [[package]] name = "inno_updater" -version = "0.9.0" +version = "0.10.1" dependencies = [ "byteorder", "crc", "slog", "slog-async", "slog-term", - "winapi", + "windows-sys", ] [[package]] @@ -329,3 +329,60 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" diff --git a/build/win32/Cargo.toml b/build/win32/Cargo.toml index decae65f9e6..cf3cc9de80b 100644 --- a/build/win32/Cargo.toml +++ b/build/win32/Cargo.toml @@ -1,18 +1,30 @@ [package] name = "inno_updater" -version = "0.9.0" +version = "0.10.1" authors = ["Microsoft "] build = "build.rs" [dependencies] -byteorder = "1" -crc = "^1.0.0" -slog = "2.1.1" -slog-async = "2.2.0" -slog-term = "2.3.0" +byteorder = "1.4.3" +crc = "3.0.1" +slog = "2.7.0" +slog-async = "2.7.0" +slog-term = "2.9.0" -[target.'cfg(windows)'.dependencies] -winapi = { version = "^0.3.9", features = ["winuser", "libloaderapi", "commctrl", "processthreadsapi", "tlhelp32", "handleapi", "psapi", "errhandlingapi", "winbase", "shellapi"] } +[target.'cfg(windows)'.dependencies.windows-sys] +version = "0.42" +features = [ + "Win32_Foundation", + "Win32_System_Shutdown", + "Win32_UI_WindowsAndMessaging", + "Win32_System_Threading", + "Win32_System_LibraryLoader", + "Win32_System_Diagnostics_Debug", + "Win32_Storage_FileSystem", + "Win32_Security", + "Win32_System_ProcessStatus", + "Win32_System_Diagnostics_ToolHelp" +] [profile.release] lto = true diff --git a/build/win32/code.iss b/build/win32/code.iss index d365ab1cbda..b7336831374 100644 --- a/build/win32/code.iss +++ b/build/win32/code.iss @@ -26,7 +26,7 @@ SetupIconFile={#RepoDir}\resources\win32\code.ico UninstallDisplayIcon={app}\{#ExeBasename}.exe ChangesEnvironment=true ChangesAssociations=true -MinVersion=6.2 +MinVersion=10.0 SourceDir={#SourceDir} AppVersion={#Version} VersionInfoVersion={#RawVersion} @@ -62,13 +62,13 @@ Name: "hungarian"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.hu.isl,{#R Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl,{#RepoDir}\build\win32\i18n\messages.tr.isl" {#LocalizedLanguageFile("trk")} [InstallDelete] -Type: filesandordirs; Name: "{app}\resources\app\out"; Check: IsNotUpdate -Type: filesandordirs; Name: "{app}\resources\app\plugins"; Check: IsNotUpdate -Type: filesandordirs; Name: "{app}\resources\app\extensions"; Check: IsNotUpdate -Type: filesandordirs; Name: "{app}\resources\app\node_modules"; Check: IsNotUpdate -Type: filesandordirs; Name: "{app}\resources\app\node_modules.asar.unpacked"; Check: IsNotUpdate -Type: files; Name: "{app}\resources\app\node_modules.asar"; Check: IsNotUpdate -Type: files; Name: "{app}\resources\app\Credits_45.0.2454.85.html"; Check: IsNotUpdate +Type: filesandordirs; Name: "{app}\resources\app\out"; Check: IsNotBackgroundUpdate +Type: filesandordirs; Name: "{app}\resources\app\plugins"; Check: IsNotBackgroundUpdate +Type: filesandordirs; Name: "{app}\resources\app\extensions"; Check: IsNotBackgroundUpdate +Type: filesandordirs; Name: "{app}\resources\app\node_modules"; Check: IsNotBackgroundUpdate +Type: filesandordirs; Name: "{app}\resources\app\node_modules.asar.unpacked"; Check: IsNotBackgroundUpdate +Type: files; Name: "{app}\resources\app\node_modules.asar"; Check: IsNotBackgroundUpdate +Type: files; Name: "{app}\resources\app\Credits_45.0.2454.85.html"; Check: IsNotBackgroundUpdate [UninstallDelete] Type: filesandordirs; Name: "{app}\_" @@ -1299,6 +1299,16 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValu Root: {#EnvironmentRootKey}; Subkey: "{#EnvironmentKey}"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; Tasks: addtopath; Check: NeedsAddPath(ExpandConstant('{app}\bin')) [Code] +function IsBackgroundUpdate(): Boolean; +begin + Result := ExpandConstant('{param:update|false}') <> 'false'; +end; + +function IsNotBackgroundUpdate(): Boolean; +begin + Result := not IsBackgroundUpdate(); +end; + // Don't allow installing conflicting architectures function InitializeSetup(): Boolean; var @@ -1351,6 +1361,7 @@ begin MsgBox('Please uninstall the ' + AltArch + '-bit version of {#NameShort} before installing this ' + ThisArch + '-bit version.', mbInformation, MB_OK); end; end; + end; function WizardNotSilent(): Boolean; @@ -1359,14 +1370,73 @@ begin end; // Updates -function IsBackgroundUpdate(): Boolean; + +var + ShouldRestartTunnelService: Boolean; + +function StopTunnelOtherProcesses(): Boolean; +var + WaitCounter: Integer; + TaskKilled: Integer; begin - Result := ExpandConstant('{param:update|false}') <> 'false'; + Log('Stopping all tunnel services (at ' + ExpandConstant('"{app}\bin\{#TunnelApplicationName}.exe"') + ')'); + ShellExec('', 'powershell.exe', '-Command "Get-WmiObject Win32_Process | Where-Object { $_.ExecutablePath -eq ' + ExpandConstant('''{app}\bin\{#TunnelApplicationName}.exe''') + ' } | Select @{Name=''Id''; Expression={$_.ProcessId}} | Stop-Process -Force"', '', SW_HIDE, ewWaitUntilTerminated, TaskKilled) + + WaitCounter := 10; + while (WaitCounter > 0) and CheckForMutexes('{#TunnelMutex}') do + begin + Log('Tunnel process is is still running, waiting'); + Sleep(500); + WaitCounter := WaitCounter - 1 + end; + + if CheckForMutexes('{#TunnelMutex}') then + begin + Log('Unable to stop tunnel processes'); + Result := False; + end + else + Result := True; end; -function IsNotUpdate(): Boolean; +procedure StopTunnelServiceIfNeeded(); +var + StopServiceResultCode: Integer; + WaitCounter: Integer; begin - Result := not IsBackgroundUpdate(); + ShouldRestartTunnelService := False; + if CheckForMutexes('{#TunnelServiceMutex}') then begin + // stop the tunnel service + Log('Stopping the tunnel service using ' + ExpandConstant('"{app}\bin\{#ApplicationName}.cmd"')); + ShellExec('', ExpandConstant('"{app}\bin\{#ApplicationName}.cmd"'), 'tunnel service uninstall', '', SW_HIDE, ewWaitUntilTerminated, StopServiceResultCode); + + Log('Stopping the tunnel service completed with result code ' + IntToStr(StopServiceResultCode)); + + WaitCounter := 10; + while (WaitCounter > 0) and CheckForMutexes('{#TunnelServiceMutex}') do + begin + Log('Tunnel service is still running, waiting'); + Sleep(500); + WaitCounter := WaitCounter - 1 + end; + if CheckForMutexes('{#TunnelServiceMutex}') then + Log('Unable to stop tunnel service') + else + ShouldRestartTunnelService := True; + end +end; + + +// called before the wizard checks for running application +function PrepareToInstall(var NeedsRestart: Boolean): String; +begin + if IsNotBackgroundUpdate() then + StopTunnelServiceIfNeeded(); + + if IsNotBackgroundUpdate() and not StopTunnelOtherProcesses() then + Result := '{#NameShort} is still running a tunnel process. Please stop the tunnel before installing.' + else + Result := ''; end; // VS Code will create a flag file before the update starts (/update=C:\foo\bar) @@ -1450,18 +1520,33 @@ end; procedure CurStepChanged(CurStep: TSetupStep); var UpdateResultCode: Integer; + StartServiceResultCode: Integer; begin - if IsBackgroundUpdate() and (CurStep = ssPostInstall) then + if CurStep = ssPostInstall then begin - CreateMutex('{#AppMutex}-ready'); - - while (CheckForMutexes('{#AppMutex}')) do + if IsBackgroundUpdate() then begin - Log('Application is still running, waiting'); - Sleep(1000); + CreateMutex('{#AppMutex}-ready'); + + while (CheckForMutexes('{#AppMutex}')) do + begin + Log('Application is still running, waiting'); + Sleep(1000) + end; + + StopTunnelServiceIfNeeded(); + + Exec(ExpandConstant('{app}\tools\inno_updater.exe'), ExpandConstant('"{app}\{#ExeBasename}.exe" ' + BoolToStr(LockFileExists())), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode); end; - Exec(ExpandConstant('{app}\tools\inno_updater.exe'), ExpandConstant('"{app}\{#ExeBasename}.exe" ' + BoolToStr(LockFileExists())), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode); + if ShouldRestartTunnelService then + begin + // start the tunnel service + Log('Restarting the tunnel service...'); + ShellExec('', ExpandConstant('"{app}\bin\{#ApplicationName}.cmd"'), 'tunnel service install', '', SW_HIDE, ewWaitUntilTerminated, StartServiceResultCode); + Log('Starting the tunnel service completed with result code ' + IntToStr(StartServiceResultCode)); + ShouldRestartTunnelService := False + end; end; end; diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe index fea47a59c9d..fa2fd26a466 100644 Binary files a/build/win32/inno_updater.exe and b/build/win32/inno_updater.exe differ diff --git a/build/yarn.lock b/build/yarn.lock index 6c46165089a..66ff004f40b 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -634,6 +634,13 @@ dependencies: "@types/node" "*" +"@types/workerpool@^6.4.0": + version "6.4.0" + resolved "https://registry.yarnpkg.com/@types/workerpool/-/workerpool-6.4.0.tgz#c79292915dd08350d10e78e74687b6f401f270b8" + integrity sha512-SIF2/169pDsLKeM8GQGHkOFifGalDbZgiBSaLUnnlVSRsAOenkAvQ6h4uhV2W+PZZczS+8LQxACwNkSykdT91A== + dependencies: + "@types/node" "*" + "@types/xml2js@0.0.33": version "0.0.33" resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.0.33.tgz#20c5dd6460245284d64a55690015b95e409fb7de" @@ -2540,26 +2547,19 @@ semver-compare@^1.0.0: integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= semver@^5.1.0, semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.3.2: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.5, semver@^7.3.8: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== +semver@^7.3.2, semver@^7.3.5, semver@^7.3.8: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" @@ -3005,6 +3005,11 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2 || 3 || 4" +workerpool@^6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.4.0.tgz#f8d5cfb45fde32fa3b7af72ad617c3369567a462" + integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A== + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" diff --git a/cglicenses.json b/cglicenses.json index 754489e3306..121cbc30c50 100644 --- a/cglicenses.json +++ b/cglicenses.json @@ -342,5 +342,199 @@ { // License is MIT/Apache and tool doesn't look in subfolders "name": "dirs-sys-next", "fullLicenseTextUri": "https://raw.githubusercontent.com/xdg-rs/dirs/master/dirs-sys/LICENSE-MIT" + }, + { + "name": "https-proxy-agent", + "fullLicenseText": [ + "(The MIT License)", + "Copyright (c) 2013 Nathan Rajlich ", + "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." + ] + }, + { + "name": "data-uri-to-buffer", + "fullLicenseText": [ + "(The MIT License)", + "Copyright (c) 2014 Nathan Rajlich ", + "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." + ] + }, + { + "name": "socks-proxy-agent", + "fullLicenseText": [ + "(The MIT License)", + "Copyright (c) 2013 Nathan Rajlich ", + "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." + ] + }, + { + "name": "http-proxy-agent", + "fullLicenseText": [ + "(The MIT License)", + "Copyright (c) 2013 Nathan Rajlich ", + "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." + ] + }, + { + "name": "agent-base", + "fullLicenseText": [ + "(The MIT License)", + "Copyright (c) 2013 Nathan Rajlich ", + "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." + ] + }, + { + "name": "anstyle", + "fullLicenseText": [ + "This software is released under the MIT license:", + "", + "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." + ] + }, + { + "name": "anstyle-query", + "fullLicenseText": [ + "This software is released under the MIT license:", + "", + "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." + ] + }, + { + "name": "anstyle-parse", + "fullLicenseText": [ + "This software is released under the MIT license:", + "", + "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." + ] + }, + { + "name": "anstyle-wincon", + "fullLicenseText": [ + "This software is released under the MIT license:", + "", + "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." + ] + }, + { + "name": "anstream", + "fullLicenseText": [ + "This software is released under the MIT license:", + "", + "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." + ] + }, + { + "name": "colorchoice", + "fullLicenseText": [ + "This software is released under the MIT license:", + "", + "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." + ] + }, + { + "name": "cacheable-request", + "prependLicenseText": [ + "Copyright (c) cacheable-request authors" + ] } ] diff --git a/cgmanifest.json b/cgmanifest.json index e4205bdc00e..9d067989dbb 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "0b17a201195ae6445e11cee50e436a3511717600" + "commitHash": "047fdbf3ca1958e4e489f0e777bf4022540f5ec2" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "22.3.5" + "version": "22.3.18" }, { "component": { @@ -611,389 +611,22 @@ "type": "npm", "npm": { "name": "mdn-data", - "version": "1.1.12" + "version": "2.0.31" } }, - "repositoryUrl": "https://github.com/mdn/data", - "licenseDetail": [ - "Mozilla Public License Version 2.0", - "", - "Copyright (c) 2018 Mozilla Corporation", - "", - "==================================", - "", - "1. Definitions", - "--------------", - "", - "1.1. \"Contributor\"", - " means each individual or legal entity that creates, contributes to", - " the creation of, or owns Covered Software.", - "", - "1.2. \"Contributor Version\"", - " means the combination of the Contributions of others (if any) used", - " by a Contributor and that particular Contributor's Contribution.", - "", - "1.3. \"Contribution\"", - " means Covered Software of a particular Contributor.", - "", - "1.4. \"Covered Software\"", - " means Source Code Form to which the initial Contributor has attached", - " the notice in Exhibit A, the Executable Form of such Source Code", - " Form, and Modifications of such Source Code Form, in each case", - " including portions thereof.", - "", - "1.5. \"Incompatible With Secondary Licenses\"", - " means", - "", - " (a) that the initial Contributor has attached the notice described", - " in Exhibit B to the Covered Software; or", - "", - " (b) that the Covered Software was made available under the terms of", - " version 1.1 or earlier of the License, but not also under the", - " terms of a Secondary License.", - "", - "1.6. \"Executable Form\"", - " means any form of the work other than Source Code Form.", - "", - "1.7. \"Larger Work\"", - " means a work that combines Covered Software with other material, in", - " a separate file or files, that is not Covered Software.", - "", - "1.8. \"License\"", - " means this document.", - "", - "1.9. \"Licensable\"", - " means having the right to grant, to the maximum extent possible,", - " whether at the time of the initial grant or subsequently, any and", - " all of the rights conveyed by this License.", - "", - "1.10. \"Modifications\"", - " means any of the following:", - "", - " (a) any file in Source Code Form that results from an addition to,", - " deletion from, or modification of the contents of Covered", - " Software; or", - "", - " (b) any new file in Source Code Form that contains any Covered", - " Software.", - "", - "1.11. \"Patent Claims\" of a Contributor", - " means any patent claim(s), including without limitation, method,", - " process, and apparatus claims, in any patent Licensable by such", - " Contributor that would be infringed, but for the grant of the", - " License, by the making, using, selling, offering for sale, having", - " made, import, or transfer of either its Contributions or its", - " Contributor Version.", - "", - "1.12. \"Secondary License\"", - " means either the GNU General Public License, Version 2.0, the GNU", - " Lesser General Public License, Version 2.1, the GNU Affero General", - " Public License, Version 3.0, or any later versions of those", - " licenses.", - "", - "1.13. \"Source Code Form\"", - " means the form of the work preferred for making modifications.", - "", - "1.14. \"You\" (or \"Your\")", - " means an individual or a legal entity exercising rights under this", - " License. For legal entities, \"You\" includes any entity that", - " controls, is controlled by, or is under common control with You. For", - " purposes of this definition, \"control\" means (a) the power, direct", - " or indirect, to cause the direction or management of such entity,", - " whether by contract or otherwise, or (b) ownership of more than", - " fifty percent (50%) of the outstanding shares or beneficial", - " ownership of such entity.", - "", - "2. License Grants and Conditions", - "--------------------------------", - "", - "2.1. Grants", - "", - "Each Contributor hereby grants You a world-wide, royalty-free,", - "non-exclusive license:", - "", - "(a) under intellectual property rights (other than patent or trademark)", - " Licensable by such Contributor to use, reproduce, make available,", - " modify, display, perform, distribute, and otherwise exploit its", - " Contributions, either on an unmodified basis, with Modifications, or", - " as part of a Larger Work; and", - "", - "(b) under Patent Claims of such Contributor to make, use, sell, offer", - " for sale, have made, import, and otherwise transfer either its", - " Contributions or its Contributor Version.", - "", - "2.2. Effective Date", - "", - "The licenses granted in Section 2.1 with respect to any Contribution", - "become effective for each Contribution on the date the Contributor first", - "distributes such Contribution.", - "", - "2.3. Limitations on Grant Scope", - "", - "The licenses granted in this Section 2 are the only rights granted under", - "this License. No additional rights or licenses will be implied from the", - "distribution or licensing of Covered Software under this License.", - "Notwithstanding Section 2.1(b) above, no patent license is granted by a", - "Contributor:", - "", - "(a) for any code that a Contributor has removed from Covered Software;", - " or", - "", - "(b) for infringements caused by: (i) Your and any other third party's", - " modifications of Covered Software, or (ii) the combination of its", - " Contributions with other software (except as part of its Contributor", - " Version); or", - "", - "(c) under Patent Claims infringed by Covered Software in the absence of", - " its Contributions.", - "", - "This License does not grant any rights in the trademarks, service marks,", - "or logos of any Contributor (except as may be necessary to comply with", - "the notice requirements in Section 3.4).", - "", - "2.4. Subsequent Licenses", - "", - "No Contributor makes additional grants as a result of Your choice to", - "distribute the Covered Software under a subsequent version of this", - "License (see Section 10.2) or under the terms of a Secondary License (if", - "permitted under the terms of Section 3.3).", - "", - "2.5. Representation", - "", - "Each Contributor represents that the Contributor believes its", - "Contributions are its original creation(s) or it has sufficient rights", - "to grant the rights to its Contributions conveyed by this License.", - "", - "2.6. Fair Use", - "", - "This License is not intended to limit any rights You have under", - "applicable copyright doctrines of fair use, fair dealing, or other", - "equivalents.", - "", - "2.7. Conditions", - "", - "Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted", - "in Section 2.1.", - "", - "3. Responsibilities", - "-------------------", - "", - "3.1. Distribution of Source Form", - "", - "All distribution of Covered Software in Source Code Form, including any", - "Modifications that You create or to which You contribute, must be under", - "the terms of this License. You must inform recipients that the Source", - "Code Form of the Covered Software is governed by the terms of this", - "License, and how they can obtain a copy of this License. You may not", - "attempt to alter or restrict the recipients' rights in the Source Code", - "Form.", - "", - "3.2. Distribution of Executable Form", - "", - "If You distribute Covered Software in Executable Form then:", - "", - "(a) such Covered Software must also be made available in Source Code", - " Form, as described in Section 3.1, and You must inform recipients of", - " the Executable Form how they can obtain a copy of such Source Code", - " Form by reasonable means in a timely manner, at a charge no more", - " than the cost of distribution to the recipient; and", - "", - "(b) You may distribute such Executable Form under the terms of this", - " License, or sublicense it under different terms, provided that the", - " license for the Executable Form does not attempt to limit or alter", - " the recipients' rights in the Source Code Form under this License.", - "", - "3.3. Distribution of a Larger Work", - "", - "You may create and distribute a Larger Work under terms of Your choice,", - "provided that You also comply with the requirements of this License for", - "the Covered Software. If the Larger Work is a combination of Covered", - "Software with a work governed by one or more Secondary Licenses, and the", - "Covered Software is not Incompatible With Secondary Licenses, this", - "License permits You to additionally distribute such Covered Software", - "under the terms of such Secondary License(s), so that the recipient of", - "the Larger Work may, at their option, further distribute the Covered", - "Software under the terms of either this License or such Secondary", - "License(s).", - "", - "3.4. Notices", - "", - "You may not remove or alter the substance of any license notices", - "(including copyright notices, patent notices, disclaimers of warranty,", - "or limitations of liability) contained within the Source Code Form of", - "the Covered Software, except that You may alter any license notices to", - "the extent required to remedy known factual inaccuracies.", - "", - "3.5. Application of Additional Terms", - "", - "You may choose to offer, and to charge a fee for, warranty, support,", - "indemnity or liability obligations to one or more recipients of Covered", - "Software. However, You may do so only on Your own behalf, and not on", - "behalf of any Contributor. You must make it absolutely clear that any", - "such warranty, support, indemnity, or liability obligation is offered by", - "You alone, and You hereby agree to indemnify every Contributor for any", - "liability incurred by such Contributor as a result of warranty, support,", - "indemnity or liability terms You offer. You may include additional", - "disclaimers of warranty and limitations of liability specific to any", - "jurisdiction.", - "", - "4. Inability to Comply Due to Statute or Regulation", - "---------------------------------------------------", - "", - "If it is impossible for You to comply with any of the terms of this", - "License with respect to some or all of the Covered Software due to", - "statute, judicial order, or regulation then You must: (a) comply with", - "the terms of this License to the maximum extent possible; and (b)", - "describe the limitations and the code they affect. Such description must", - "be placed in a text file included with all distributions of the Covered", - "Software under this License. Except to the extent prohibited by statute", - "or regulation, such description must be sufficiently detailed for a", - "recipient of ordinary skill to be able to understand it.", - "", - "5. Termination", - "--------------", - "", - "5.1. The rights granted under this License will terminate automatically", - "if You fail to comply with any of its terms. However, if You become", - "compliant, then the rights granted under this License from a particular", - "Contributor are reinstated (a) provisionally, unless and until such", - "Contributor explicitly and finally terminates Your grants, and (b) on an", - "ongoing basis, if such Contributor fails to notify You of the", - "non-compliance by some reasonable means prior to 60 days after You have", - "come back into compliance. Moreover, Your grants from a particular", - "Contributor are reinstated on an ongoing basis if such Contributor", - "notifies You of the non-compliance by some reasonable means, this is the", - "first time You have received notice of non-compliance with this License", - "from such Contributor, and You become compliant prior to 30 days after", - "Your receipt of the notice.", - "", - "5.2. If You initiate litigation against any entity by asserting a patent", - "infringement claim (excluding declaratory judgment actions,", - "counter-claims, and cross-claims) alleging that a Contributor Version", - "directly or indirectly infringes any patent, then the rights granted to", - "You by any and all Contributors for the Covered Software under Section", - "2.1 of this License shall terminate.", - "", - "5.3. In the event of termination under Sections 5.1 or 5.2 above, all", - "end user license agreements (excluding distributors and resellers) which", - "have been validly granted by You or Your distributors under this License", - "prior to termination shall survive termination.", - "", - "************************************************************************", - "* *", - "* 6. Disclaimer of Warranty *", - "* ------------------------- *", - "* *", - "* Covered Software is provided under this License on an \"as is\" *", - "* basis, without warranty of any kind, either expressed, implied, or *", - "* statutory, including, without limitation, warranties that the *", - "* Covered Software is free of defects, merchantable, fit for a *", - "* particular purpose or non-infringing. The entire risk as to the *", - "* quality and performance of the Covered Software is with You. *", - "* Should any Covered Software prove defective in any respect, You *", - "* (not any Contributor) assume the cost of any necessary servicing, *", - "* repair, or correction. This disclaimer of warranty constitutes an *", - "* essential part of this License. No use of any Covered Software is *", - "* authorized under this License except under this disclaimer. *", - "* *", - "************************************************************************", - "", - "************************************************************************", - "* *", - "* 7. Limitation of Liability *", - "* -------------------------- *", - "* *", - "* Under no circumstances and under no legal theory, whether tort *", - "* (including negligence), contract, or otherwise, shall any *", - "* Contributor, or anyone who distributes Covered Software as *", - "* permitted above, be liable to You for any direct, indirect, *", - "* special, incidental, or consequential damages of any character *", - "* including, without limitation, damages for lost profits, loss of *", - "* goodwill, work stoppage, computer failure or malfunction, or any *", - "* and all other commercial damages or losses, even if such party *", - "* shall have been informed of the possibility of such damages. This *", - "* limitation of liability shall not apply to liability for death or *", - "* personal injury resulting from such party's negligence to the *", - "* extent applicable law prohibits such limitation. Some *", - "* jurisdictions do not allow the exclusion or limitation of *", - "* incidental or consequential damages, so this exclusion and *", - "* limitation may not apply to You. *", - "* *", - "************************************************************************", - "", - "8. Litigation", - "-------------", - "", - "Any litigation relating to this License may be brought only in the", - "courts of a jurisdiction where the defendant maintains its principal", - "place of business and such litigation shall be governed by laws of that", - "jurisdiction, without reference to its conflict-of-law provisions.", - "Nothing in this Section shall prevent a party's ability to bring", - "cross-claims or counter-claims.", - "", - "9. Miscellaneous", - "----------------", - "", - "This License represents the complete agreement concerning the subject", - "matter hereof. If any provision of this License is held to be", - "unenforceable, such provision shall be reformed only to the extent", - "necessary to make it enforceable. Any law or regulation which provides", - "that the language of a contract shall be construed against the drafter", - "shall not be used to construe this License against a Contributor.", - "", - "10. Versions of the License", - "---------------------------", - "", - "10.1. New Versions", - "", - "Mozilla Foundation is the license steward. Except as provided in Section", - "10.3, no one other than the license steward has the right to modify or", - "publish new versions of this License. Each version will be given a", - "distinguishing version number.", - "", - "10.2. Effect of New Versions", - "", - "You may distribute the Covered Software under the terms of the version", - "of the License under which You originally received the Covered Software,", - "or under the terms of any subsequent version published by the license", - "steward.", - "", - "10.3. Modified Versions", - "", - "If you create software not governed by this License, and you want to", - "create a new license for such software, you may create and use a", - "modified version of this License if you rename the license and remove", - "any references to the name of the license steward (except to note that", - "such modified license differs from this License).", - "", - "10.4. Distributing Source Code Form that is Incompatible With Secondary", - "Licenses", - "", - "If You choose to distribute Source Code Form that is Incompatible With", - "Secondary Licenses under the terms of this version of the License, the", - "notice described in Exhibit B of this License must be attached.", - "", - "Exhibit A - Source Code Form License Notice", - "-------------------------------------------", - "", - " This Source Code Form is subject to the terms of the Mozilla Public", - " License, v. 2.0. If a copy of the MPL was not distributed with this", - " file, You can obtain one at http://mozilla.org/MPL/2.0/.", - "", - "If it is not possible or desirable to put the notice in a particular", - "file, then You may include the notice in a location (such as a LICENSE", - "file in a relevant directory) where a recipient would be likely to look", - "for such a notice.", - "", - "You may add additional accurate notices of copyright ownership.", - "", - "Exhibit B - \"Incompatible With Secondary Licenses\" Notice", - "---------------------------------------------------------", - "", - " This Source Code Form is \"Incompatible With Secondary Licenses\", as", - " defined by the Mozilla Public License, v. 2.0." - ], - "license": "MPL" + "isOnlyProductionDependency": true, + "repositoryUrl": "https://github.com/mdn/data" + }, + { + "component": { + "type": "npm", + "npm": { + "name": "@mdn/browser-compat-data", + "version": "5.2.45" + } + }, + "isOnlyProductionDependency": true, + "repositoryUrl": "https://github.com/mdn/browser-compat-data" }, { "component": { diff --git a/cli/Cargo.lock b/cli/Cargo.lock index a4b541970d0..fcbb3fee49f 100644 --- a/cli/Cargo.lock +++ b/cli/Cargo.lock @@ -10,13 +10,19 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.19" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -27,14 +33,73 @@ dependencies = [ ] [[package]] -name = "async-broadcast" -version = "0.4.1" +name = "anstream" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d26004fe83b2d1cd3a97609b21e39f9a31535822210fe83205d2ce48866ea61" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ "event-listener", "futures-core", - "parking_lot", +] + +[[package]] +name = "async-channel" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +dependencies = [ + "concurrent-queue 2.2.0", + "event-listener", + "futures-core", ] [[package]] @@ -44,7 +109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7" dependencies = [ "autocfg", - "concurrent-queue", + "concurrent-queue 1.2.4", "futures-lite", "libc", "log", @@ -57,6 +122,33 @@ dependencies = [ "winapi", ] +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-process" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +dependencies = [ + "async-io", + "async-lock", + "autocfg", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", + "signal-hook", + "windows-sys 0.48.0", +] + [[package]] name = "async-recursion" version = "1.0.0" @@ -65,30 +157,31 @@ checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + [[package]] name = "async-trait" -version = "0.1.58" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] -name = "atty" -version = "0.2.14" +name = "atomic-waker" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "autocfg" @@ -102,6 +195,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + [[package]] name = "bit-vec" version = "0.6.3" @@ -132,6 +231,21 @@ dependencies = [ "generic-array", ] +[[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", +] + [[package]] name = "bumpalo" version = "3.12.0" @@ -170,66 +284,65 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", - "js-sys", - "num-integer", "num-traits", "serde", - "time", - "wasm-bindgen", "winapi", ] [[package]] name = "clap" -version = "3.2.22" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" +checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" dependencies = [ - "atty", - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "indexmap", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", "strsim", - "termcolor", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "code-cli" version = "0.1.0" dependencies = [ "async-trait", - "atty", - "base64", + "base64 0.21.2", "bytes", "cfg-if", "chrono", @@ -239,7 +352,7 @@ dependencies = [ "const_format", "core-foundation", "dialoguer", - "dirs 4.0.0", + "dirs 5.0.1", "flate2", "futures", "gethostname", @@ -251,7 +364,6 @@ dependencies = [ "log", "open", "opentelemetry", - "opentelemetry-application-insights", "pin-project", "rand 0.8.5", "regex", @@ -270,10 +382,10 @@ dependencies = [ "tokio-util", "tunnels", "url", - "uuid", + "uuid 1.3.3", "winapi", - "winreg", - "zbus 3.4.0", + "winreg 0.50.0", + "zbus", "zip", ] @@ -287,6 +399,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "concurrent-queue" version = "1.2.4" @@ -297,32 +415,41 @@ dependencies = [ ] [[package]] -name = "console" -version = "0.15.5" +name = "concurrent-queue" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "const_format" -version = "0.2.30" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e" +checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.29" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650" +checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" dependencies = [ "proc-macro2", "quote", @@ -347,9 +474,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" dependencies = [ "libc", ] @@ -373,30 +500,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - [[package]] name = "crossbeam-utils" version = "0.8.12" @@ -418,9 +521,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.78" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4" +checksum = "e88abab2f5abbe4c56e8f1fb431b784d710b709888f35755a160e62e33fe38e8" dependencies = [ "cc", "cxxbridge-flags", @@ -430,9 +533,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.78" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e580d70777c116df50c390d1211993f62d40302881e54d4b79727acb83d0199" +checksum = "5c0c11acd0e63bae27dcd2afced407063312771212b7a823b4fd72d633be30fb" dependencies = [ "cc", "codespan-reporting", @@ -440,24 +543,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 2.0.18", ] [[package]] name = "cxxbridge-flags" -version = "1.0.78" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c" +checksum = "8d3816ed957c008ccd4728485511e3d9aaf7db419aa321e3d2c5a2f3411e36c8" [[package]] name = "cxxbridge-macro" -version = "1.0.78" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea" +checksum = "a26acccf6f445af85ea056362561a24ef56cdc15fcc685f03aec50b9c702cb6d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] @@ -474,14 +577,14 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "dialoguer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af3c796f3b0b408d9fd581611b47fa850821fcb84aa640b83a3c1a5be2d691f2" +checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" dependencies = [ "console", "shell-words", @@ -500,22 +603,22 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -dependencies = [ - "dirs-sys", -] - [[package]] name = "dirs" version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", ] [[package]] @@ -530,10 +633,16 @@ dependencies = [ ] [[package]] -name = "either" -version = "1.8.0" +name = "dirs-sys" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] [[package]] name = "encode_unicode" @@ -552,55 +661,34 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.6.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" dependencies = [ - "enumflags2_derive 0.6.4", - "serde", -] - -[[package]] -name = "enumflags2" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" -dependencies = [ - "enumflags2_derive 0.7.4", + "enumflags2_derive", "serde", ] [[package]] name = "enumflags2_derive" -version = "0.6.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "syn 2.0.18", ] [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -636,15 +724,15 @@ checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "windows-sys 0.36.1", ] [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -682,9 +770,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -697,9 +785,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -707,15 +795,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -724,9 +812,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" @@ -745,32 +833,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -796,12 +884,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.2.3" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "winapi", + "windows-targets 0.48.0", ] [[package]] @@ -866,6 +954,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -960,23 +1054,23 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.51" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde6edd6cef363e9359ed3c98ba64590ba9eecba2293eb5a723ab32aee8926aa" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" dependencies = [ "cxx", "cxx-build", @@ -1004,14 +1098,15 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.16.2" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" +checksum = "db45317f37ef454e6519b6c3ed7d377e5f23346f0823f86e65ca36912d1d0ef8" dependencies = [ "console", - "lazy_static", + "instant", "number_prefix", - "regex", + "portable-atomic", + "unicode-width", ] [[package]] @@ -1035,12 +1130,13 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -1049,6 +1145,37 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + [[package]] name = "itoa" version = "1.0.4" @@ -1066,11 +1193,13 @@ dependencies = [ [[package]] name = "keyring" -version = "1.2.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fb8399ddcabfccb274577a8d90f0653e0b5b5977797c1c8834ad09839a10e5" +checksum = "e319fe0cb5b29a55cdb228df3f651b6c8cdc5b19520f3e62c8f111dc2582026c" dependencies = [ "byteorder", + "lazy_static", + "linux-keyutils", "secret-service", "security-framework", "winapi", @@ -1084,24 +1213,34 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.135" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" dependencies = [ "cc", ] [[package]] -name = "linux-raw-sys" -version = "0.1.4" +name = "linux-keyutils" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "3f27bb67f6dd1d0bb5ab582868e4f65052e58da6401188a08f0da09cf512b84b" +dependencies = [ + "bitflags", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" @@ -1115,12 +1254,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" [[package]] name = "md5" @@ -1136,9 +1272,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] @@ -1151,9 +1287,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -1188,41 +1324,17 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nb-connect" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1bb540dc6ef51cfe1916ec038ce7a620daf3a111e2502d745197cd53d6bca15" -dependencies = [ - "libc", - "socket2", -] - [[package]] name = "nix" -version = "0.22.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", - "cc", - "cfg-if", - "libc", - "memoffset", -] - -[[package]] -name = "nix" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" -dependencies = [ - "autocfg", "bitflags", "cfg-if", "libc", "memoffset", - "pin-utils", + "static_assertions", ] [[package]] @@ -1317,7 +1429,7 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -1329,25 +1441,25 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "once_cell" -version = "1.15.0" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" [[package]] name = "open" -version = "2.1.3" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2423ffbf445b82e58c3b1543655968923dd06f85432f10be2bb4f1b7122f98c" +checksum = "d16814a067484415fda653868c9be0ac5f2abd2ef5d951082a5f2fe1b3662944" dependencies = [ + "is-wsl", "pathdiff", - "windows-sys 0.36.1", ] [[package]] name = "openssl" -version = "0.10.48" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags", "cfg-if", @@ -1366,7 +1478,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -1377,11 +1489,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.83" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -1390,76 +1501,34 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +checksum = "5f4b8347cc26099d3aeee044065ecc3ae11469796b4d65d065a23a584ed92a6f" dependencies = [ "opentelemetry_api", "opentelemetry_sdk", ] -[[package]] -name = "opentelemetry-application-insights" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e592c598da4cbf1b4c4c8c07df4d3fb3a0202326cccf90621dbf23286cb79ea6" -dependencies = [ - "bytes", - "chrono", - "flate2", - "http", - "once_cell", - "opentelemetry", - "opentelemetry-http", - "opentelemetry-semantic-conventions", - "reqwest", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "opentelemetry-http" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" -dependencies = [ - "async-trait", - "bytes", - "http", - "opentelemetry_api", - "reqwest", -] - -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" -dependencies = [ - "opentelemetry", -] - [[package]] name = "opentelemetry_api" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +checksum = "ed41783a5bf567688eb38372f2b7a8530f5a607a4b49d38dd7573236c23ca7e2" dependencies = [ "futures-channel", "futures-util", "indexmap", - "js-sys", "once_cell", "pin-project-lite", "thiserror", + "urlencoding", ] [[package]] name = "opentelemetry_sdk" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +checksum = "8b3a2a91fdbfdd4d212c0dcc2ab540de2c2bcbbd90be17de7a7daf8822d010c1" dependencies = [ "async-trait", "crossbeam-channel", @@ -1476,21 +1545,21 @@ dependencies = [ ] [[package]] -name = "ordered-stream" -version = "0.1.1" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034ce384018b245e8d8424bbe90577fbd91a533be74107e465e3474eb2285eef" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" dependencies = [ "futures-core", "pin-project-lite", ] -[[package]] -name = "os_str_bytes" -version = "6.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" - [[package]] name = "parking" version = "2.0.0" @@ -1515,7 +1584,7 @@ checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.36.1", ] @@ -1540,22 +1609,22 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] @@ -1590,21 +1659,18 @@ dependencies = [ "winapi", ] +[[package]] +name = "portable-atomic" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" + [[package]] name = "ppv-lite86" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - [[package]] name = "proc-macro-crate" version = "1.2.1" @@ -1616,44 +1682,20 @@ dependencies = [ "toml", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -1729,30 +1771,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rayon" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -1762,6 +1780,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -1769,15 +1796,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.7", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.6.0" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ "aho-corasick", "memchr", @@ -1786,17 +1813,17 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "reqwest" -version = "0.11.12" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -1824,8 +1851,9 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", - "winreg", + "winreg 0.10.1", ] [[package]] @@ -1852,9 +1880,10 @@ dependencies = [ [[package]] name = "russh" -version = "0.34.0-beta.16" -source = "git+https://github.com/microsoft/vscode-russh?branch=main#d22cf71d9ea36751322eeb9aa1e8c438a3aa1aef" +version = "0.37.1" +source = "git+https://github.com/microsoft/vscode-russh?branch=main#6a15199c784c0b6d171a6fec09ed730a5cd1350d" dependencies = [ + "async-trait", "bitflags", "byteorder", "digest", @@ -1875,12 +1904,13 @@ dependencies = [ "subtle", "thiserror", "tokio", + "tokio-util", ] [[package]] name = "russh-cryptovec" -version = "0.7.0-beta.1" -source = "git+https://github.com/microsoft/vscode-russh?branch=main#d22cf71d9ea36751322eeb9aa1e8c438a3aa1aef" +version = "0.7.0" +source = "git+https://github.com/microsoft/vscode-russh?branch=main#6a15199c784c0b6d171a6fec09ed730a5cd1350d" dependencies = [ "libc", "winapi", @@ -1888,13 +1918,13 @@ dependencies = [ [[package]] name = "russh-keys" -version = "0.22.0-beta.7" -source = "git+https://github.com/microsoft/vscode-russh?branch=main#d22cf71d9ea36751322eeb9aa1e8c438a3aa1aef" +version = "0.37.1" +source = "git+https://github.com/microsoft/vscode-russh?branch=main#6a15199c784c0b6d171a6fec09ed730a5cd1350d" dependencies = [ "bit-vec", "byteorder", "data-encoding", - "dirs 3.0.2", + "dirs 4.0.0", "futures", "inout", "log", @@ -1906,7 +1936,6 @@ dependencies = [ "rand_core 0.5.1", "russh-cryptovec", "serde", - "serde_derive", "sha2", "thiserror", "tokio", @@ -1916,16 +1945,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.7" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -1944,12 +1973,6 @@ dependencies = [ "windows-sys 0.36.1", ] -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - [[package]] name = "scopeguard" version = "1.1.0" @@ -1958,24 +1981,24 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "secret-service" -version = "2.0.2" -source = "git+https://github.com/microsoft/vscode-secret-service-rs?rev=fbbaf222de10546609be26bb043e64356e855edb#fbbaf222de10546609be26bb043e64356e855edb" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da1a5ad4d28c03536f82f77d9f36603f5e37d8869ac98f0a750d5b5686d8d95" dependencies = [ - "lazy_static", + "futures-util", + "generic-array", "num", + "once_cell", "openssl", "rand 0.8.5", "serde", - "zbus 1.9.3", - "zbus_macros 1.9.3", - "zvariant 2.10.0", - "zvariant_derive 2.10.0", + "zbus", ] [[package]] @@ -2003,38 +2026,38 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.145" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] name = "serde_json" -version = "1.0.86" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -2049,7 +2072,7 @@ checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -2109,6 +2132,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" +[[package]] +name = "signal-hook" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.4.0" @@ -2135,9 +2168,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -2173,17 +2206,27 @@ dependencies = [ ] [[package]] -name = "sysinfo" -version = "0.27.7" +name = "syn" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975fe381e0ecba475d4acff52466906d95b153a40324956552e027b2a9eaa89e" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sysinfo" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02f1dc6930a439cc5d154221b5387d153f8183529b07c19aca24ea31e0a167e1" dependencies = [ "cfg-if", "core-foundation-sys", "libc", "ntapi", "once_cell", - "rayon", "winapi", ] @@ -2200,63 +2243,62 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" - [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] name = "time" -version = "0.1.44" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "serde", + "time-core", ] +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + [[package]] name = "tinyvec" version = "1.6.0" @@ -2274,14 +2316,13 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.25.0" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot", @@ -2289,18 +2330,19 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "tracing", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] @@ -2340,9 +2382,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -2388,7 +2430,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -2412,7 +2454,7 @@ version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ - "base64", + "base64 0.13.0", "byteorder", "bytes", "http", @@ -2429,7 +2471,7 @@ dependencies = [ [[package]] name = "tunnels" version = "0.1.0" -source = "git+https://github.com/microsoft/dev-tunnels?rev=730aa86f8ccd9e2dd4541693fbce763357da93f4#730aa86f8ccd9e2dd4541693fbce763357da93f4" +source = "git+https://github.com/microsoft/dev-tunnels?rev=2621784a9ad72aa39500372391332a14bad581a3#2621784a9ad72aa39500372391332a14bad581a3" dependencies = [ "async-trait", "chrono", @@ -2447,7 +2489,7 @@ dependencies = [ "tokio-util", "tungstenite", "url", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -2510,17 +2552,38 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "urlencoding" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" + [[package]] name = "utf-8" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom 0.2.7", +] + +[[package]] +name = "uuid" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ "getrandom 0.2.7", "serde", @@ -2560,12 +2623,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2593,7 +2650,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-shared", ] @@ -2627,7 +2684,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2638,6 +2695,19 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +[[package]] +name = "wasm-streams" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "web-sys" version = "0.3.60" @@ -2688,6 +2758,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-sys" version = "0.36.1" @@ -2703,24 +2782,63 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -2730,9 +2848,15 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -2742,9 +2866,15 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -2754,9 +2884,15 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -2766,15 +2902,27 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -2784,9 +2932,24 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -2797,6 +2960,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "xattr" version = "0.2.3" @@ -2807,10 +2980,20 @@ dependencies = [ ] [[package]] -name = "yasna" -version = "0.4.0" +name = "xdg-home" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e262a29d0e61ccf2b6190d7050d4b237535fc76ce4c1210d9caa316f71dffa75" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix", + "winapi", +] + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ "bit-vec", "num-bigint", @@ -2818,47 +3001,23 @@ dependencies = [ [[package]] name = "zbus" -version = "1.9.3" +version = "3.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cbeb2291cd7267a94489b71376eda33496c1b9881adf6b36f26cc2779f3fc49" -dependencies = [ - "async-io", - "byteorder", - "derivative", - "enumflags2 0.6.4", - "fastrand", - "futures", - "nb-connect", - "nix 0.22.3", - "once_cell", - "polling", - "scoped-tls", - "serde", - "serde_repr", - "zbus_macros 1.9.3", - "zvariant 2.10.0", -] - -[[package]] -name = "zbus" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a0b85c5608c27d2306d67e955b9c6e23a42d824205c85038a7afbe19c0ae22" +checksum = "6c3d77c9966c28321f1907f0b6c5a5561189d1f7311eea6d94180c6be9daab29" dependencies = [ "async-broadcast", + "async-process", "async-recursion", "async-trait", "byteorder", "derivative", - "dirs 4.0.0", - "enumflags2 0.7.5", + "enumflags2", "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "lazy_static", - "nix 0.25.0", + "nix", "once_cell", "ordered-stream", "rand 0.8.5", @@ -2870,45 +3029,36 @@ dependencies = [ "tracing", "uds_windows", "winapi", - "zbus_macros 3.4.0", + "xdg-home", + "zbus_macros", "zbus_names", - "zvariant 3.7.1", + "zvariant", ] [[package]] name = "zbus_macros" -version = "1.9.3" +version = "3.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa3959a7847cf95e3d51e312856617c5b1b77191176c65a79a5f14d778bbe0a6" +checksum = "f6e341d12edaff644e539ccbbf7f161601294c9a84ed3d7e015da33155b435af" dependencies = [ - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zbus_macros" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18018648e7e10ed856809befe7309002b87b2b12d5b282cb5040d7974b58677" -dependencies = [ - "proc-macro-crate 1.2.1", + "proc-macro-crate", "proc-macro2", "quote", "regex", - "syn", + "syn 1.0.103", + "winnow", + "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.2.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a408fd8a352695690f53906dc7fd036be924ec51ea5e05666ff42685ed0af5" +checksum = "82441e6033be0a741157a72951a3e4957d519698f3a824439cc131c5ba77ac2a" dependencies = [ "serde", "static_assertions", - "zvariant 3.7.1", + "zvariant", ] [[package]] @@ -2919,65 +3069,51 @@ checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" [[package]] name = "zip" -version = "0.5.13" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "byteorder", "crc32fast", + "crossbeam-utils", "flate2", - "thiserror", "time", ] [[package]] name = "zvariant" -version = "2.10.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525" +checksum = "622cc473f10cef1b0d73b7b34a266be30ebdcfaea40ec297dd8cbda088f9f93c" dependencies = [ "byteorder", - "enumflags2 0.6.4", + "enumflags2", "libc", "serde", "static_assertions", - "zvariant_derive 2.10.0", -] - -[[package]] -name = "zvariant" -version = "3.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794fb7f59af4105697b0449ba31731ee5dbb3e773a17dbdf3d36206ea1b1644" -dependencies = [ - "byteorder", - "enumflags2 0.7.5", - "libc", - "serde", - "static_assertions", - "zvariant_derive 3.7.1", + "zvariant_derive", ] [[package]] name = "zvariant_derive" -version = "2.10.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9" +checksum = "5d9c1b57352c25b778257c661f3c4744b7cefb7fc09dd46909a153cce7773da2" dependencies = [ - "proc-macro-crate 1.2.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.103", + "zvariant_utils", ] [[package]] -name = "zvariant_derive" -version = "3.7.1" +name = "zvariant_utils" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd58d4b6c8e26d3dd2149c8c40c6613ef6451b9885ff1296d1ac86c388351a54" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ - "proc-macro-crate 1.2.1", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 6b5c8d07c3f..8aad5fea7b8 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -12,70 +12,67 @@ path = "src/lib.rs" name = "code" [dependencies] -futures = "0.3" -clap = { version = "3.0", features = ["derive", "env"] } -open = { version = "2.1.0" } -reqwest = { version = "0.11.9", default-features = false, features = ["json", "stream", "native-tls"] } -tokio = { version = "1.24.2", features = ["full"] } -tokio-util = { version = "0.7", features = ["compat", "codec"] } -flate2 = { version = "1.0.22" } -zip = { version = "0.5.13", default-features = false, features = ["time", "deflate"] } -regex = { version = "1.5.5" } -lazy_static = { version = "1.4.0" } -sysinfo = { version = "0.27.7" } -serde = { version = "1.0", features = ["derive"] } -serde_json = { version = "1.0" } -rmp-serde = "1.0" -uuid = { version = "0.8.2", features = ["serde", "v4"] } -dirs = "4.0.0" +futures = "0.3.28" +clap = { version = "4.3.0", features = ["derive", "env"] } +open = "4.1.0" +reqwest = { version = "0.11.18", default-features = false, features = ["json", "stream", "native-tls"] } +tokio = { version = "1.28.2", features = ["full"] } +tokio-util = { version = "0.7.8", features = ["compat", "codec"] } +flate2 = "1.0.26" +zip = { version = "0.6.6", default-features = false, features = ["time", "deflate"] } +regex = "1.8.3" +lazy_static = "1.4.0" +sysinfo = { version = "0.29.0", default-features = false } +serde = { version = "1.0.163", features = ["derive"] } +serde_json = "1.0.96" +rmp-serde = "1.1.1" +uuid = { version = "1.3.3", features = ["serde", "v4"] } +dirs = "5.0.1" rand = "0.8.5" -atty = "0.2.14" -opentelemetry = { version = "0.18.0", features = ["rt-tokio"] } -opentelemetry-application-insights = { version = "0.22.0", features = ["reqwest-client"] } -serde_bytes = "0.11.5" -chrono = { version = "0.4", features = ["serde"] } -gethostname = "0.2.3" -libc = "0.2" -tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "730aa86f8ccd9e2dd4541693fbce763357da93f4", default-features = false, features = ["connections"] } -keyring = "1.1" -dialoguer = "0.10" -hyper = "0.14" -indicatif = "0.16" -tempfile = "3.4" -clap_lex = "0.2" -url = "2.3" -async-trait = "0.1" -log = "0.4" -const_format = "0.2" -sha2 = "0.10" -base64 = "0.13" +opentelemetry = { version = "0.19.0", features = ["rt-tokio"] } +serde_bytes = "0.11.9" +chrono = { version = "0.4.26", features = ["serde", "std", "clock"], default-features = false } +gethostname = "0.4.3" +libc = "0.2.144" +tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "2621784a9ad72aa39500372391332a14bad581a3", default-features = false, features = ["connections"] } +keyring = { version = "2.0.3", default-features = false, features = ["linux-secret-service-rt-tokio-crypto-openssl"] } +dialoguer = "0.10.4" +hyper = "0.14.26" +indicatif = "0.17.4" +tempfile = "3.5.0" +clap_lex = "0.5.0" +url = "2.3.1" +async-trait = "0.1.68" +log = "0.4.18" +const_format = "0.2.31" +sha2 = "0.10.6" +base64 = "0.21.2" shell-escape = "0.1.5" -thiserror = "1.0" +thiserror = "1.0.40" cfg-if = "1.0.0" -pin-project = "1.0" -console = "0.15" -bytes = "1.4" -tar = { version = "0.4" } +pin-project = "1.1.0" +console = "0.15.7" +bytes = "1.4.0" +tar = "0.4.38" [build-dependencies] -serde = { version = "1.0" } -serde_json = { version = "1.0" } +serde = "1.0.163" +serde_json = "1.0.96" [target.'cfg(windows)'.dependencies] -winreg = "0.10" +winreg = "0.50.0" winapi = "0.3.9" [target.'cfg(target_os = "macos")'.dependencies] core-foundation = "0.9.3" [target.'cfg(target_os = "linux")'.dependencies] -zbus = { version = "3.4", default-features = false, features = ["tokio"] } +zbus = { version = "3.13.1", default-features = false, features = ["tokio"] } [patch.crates-io] russh = { git = "https://github.com/microsoft/vscode-russh", branch = "main" } russh-cryptovec = { git = "https://github.com/microsoft/vscode-russh", branch = "main" } russh-keys = { git = "https://github.com/microsoft/vscode-russh", branch = "main" } -secret-service = { git = "https://github.com/microsoft/vscode-secret-service-rs", rev = "fbbaf222de10546609be26bb043e64356e855edb" } [profile.release] strip = true diff --git a/cli/ThirdPartyNotices.txt b/cli/ThirdPartyNotices.txt new file mode 100644 index 00000000000..ba85a27096c --- /dev/null +++ b/cli/ThirdPartyNotices.txt @@ -0,0 +1,10946 @@ +NOTICES AND INFORMATION +Do Not Translate or Localize + +This software incorporates material from third parties. +Microsoft makes certain open source code available at https://3rdpartysource.microsoft.com, +or you may send a check or money order for US $5.00, including the product name, +the open source component name, platform, and version number, to: + +Source Code Compliance Team +Microsoft Corporation +One Microsoft Way +Redmond, WA 98052 +USA + +Notwithstanding any other terms, you may reverse engineer this software to the extent +required to debug changes to any libraries licensed under the GNU Lesser General Public License. + + + +--------------------------------------------------------- + +adler 1.0.2 - 0BSD OR MIT OR Apache-2.0 +https://github.com/jonas-schievink/adler + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +aho-corasick 1.0.1 - Unlicense OR MIT +https://github.com/BurntSushi/aho-corasick + +The MIT License (MIT) + +Copyright (c) 2015 Andrew Gallant + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +android-tzdata 0.1.1 - MIT OR Apache-2.0 +https://github.com/RumovZ/android-tzdata + +MIT License + +Copyright (c) [year] [fullname] + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +android_system_properties 0.1.5 - MIT/Apache-2.0 +https://github.com/nical/android_system_properties + +The MIT License (MIT) + +Copyright (c) 2013 Nicolas Silva + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +anstream 0.3.2 - MIT OR Apache-2.0 +https://github.com/rust-cli/anstyle + +This software is released under the MIT license: + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +anstyle 1.0.0 - MIT OR Apache-2.0 +https://github.com/rust-cli/anstyle + +This software is released under the MIT license: + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +anstyle-parse 0.2.0 - MIT OR Apache-2.0 +https://github.com/rust-cli/anstyle + +This software is released under the MIT license: + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +anstyle-query 1.0.0 - MIT OR Apache-2.0 +https://github.com/rust-cli/anstyle + +This software is released under the MIT license: + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +anstyle-wincon 1.0.1 - MIT OR Apache-2.0 +https://github.com/rust-cli/anstyle + +This software is released under the MIT license: + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +async-broadcast 0.5.1 - MIT OR Apache-2.0 +https://github.com/smol-rs/async-broadcast + +The MIT License (MIT) + +Copyright (c) 2020 Yoshua Wuyts + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +async-channel 1.8.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/async-channel + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +async-io 1.9.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/async-io + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +async-lock 2.7.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/async-lock + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +async-process 1.7.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/async-process + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +async-recursion 1.0.0 - MIT OR Apache-2.0 +https://github.com/dcchut/async-recursion + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +async-task 4.4.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/async-task + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +async-trait 0.1.68 - MIT OR Apache-2.0 +https://github.com/dtolnay/async-trait + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +atomic-waker 1.1.1 - Apache-2.0 OR MIT +https://github.com/smol-rs/atomic-waker + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +atty 0.2.14 - MIT +https://github.com/softprops/atty + +The MIT License (MIT) + +Copyright (c) 2015-2019 Doug Tangren + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +autocfg 1.1.0 - Apache-2.0 OR MIT +https://github.com/cuviper/autocfg + +Copyright (c) 2018 Josh Stone + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +base64 0.13.0 - MIT/Apache-2.0 +base64 0.21.2 - MIT OR Apache-2.0 +https://github.com/marshallpierce/rust-base64 + +The MIT License (MIT) + +Copyright (c) 2015 Alice Maz + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +bit-vec 0.6.3 - MIT/Apache-2.0 +https://github.com/contain-rs/bit-vec + +Copyright (c) 2023 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +bitflags 1.3.2 - MIT/Apache-2.0 +https://github.com/bitflags/bitflags + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +block-buffer 0.10.3 - MIT OR Apache-2.0 +https://github.com/RustCrypto/utils + +All crates licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260052-utils +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/utils + +[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg +[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg +[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg +[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg +[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg +[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg +[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg + +[//]: # (crates) + +[`blobby`]: ./blobby +[`block-buffer`]: ./block-buffer +[`blockā€‘padding`]: ./block-padding +[`cmov`]: ./cmov +[`collectable`]: ./collectable +[`cpufeatures`]: ./cpufeatures +[`dbl`]: ./dbl +[`hex-literal`]: ./hex-literal +[`inout`]: ./inout +[`opaque-debug`]: ./opaque-debug +[`wycheproof2blb`]: ./wycheproof2blb +[`zeroize`]: ./zeroize + +[//]: # (misc) + +[Wycheproof]: https://github.com/google/wycheproof +--------------------------------------------------------- + +--------------------------------------------------------- + +block-padding 0.3.2 - MIT OR Apache-2.0 +https://github.com/RustCrypto/utils + +All crates licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260052-utils +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/utils + +[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg +[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg +[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg +[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg +[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg +[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg +[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg + +[//]: # (crates) + +[`blobby`]: ./blobby +[`block-buffer`]: ./block-buffer +[`blockā€‘padding`]: ./block-padding +[`cmov`]: ./cmov +[`collectable`]: ./collectable +[`cpufeatures`]: ./cpufeatures +[`dbl`]: ./dbl +[`hex-literal`]: ./hex-literal +[`inout`]: ./inout +[`opaque-debug`]: ./opaque-debug +[`wycheproof2blb`]: ./wycheproof2blb +[`zeroize`]: ./zeroize + +[//]: # (misc) + +[Wycheproof]: https://github.com/google/wycheproof +--------------------------------------------------------- + +--------------------------------------------------------- + +blocking 1.3.1 - Apache-2.0 OR MIT +https://github.com/smol-rs/blocking + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +bumpalo 3.12.0 - MIT/Apache-2.0 +https://github.com/fitzgen/bumpalo + +Copyright (c) 2019 Nick Fitzgerald + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +byteorder 1.4.3 - Unlicense OR MIT +https://github.com/BurntSushi/byteorder + +The MIT License (MIT) + +Copyright (c) 2015 Andrew Gallant + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +bytes 1.4.0 - MIT +https://github.com/tokio-rs/bytes + +The MIT License (MIT) + +Copyright (c) 2018 Carl Lerche + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +cache-padded 1.2.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/cache-padded + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +cc 1.0.73 - MIT/Apache-2.0 +https://github.com/rust-lang/cc-rs + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +cfg-if 1.0.0 - MIT/Apache-2.0 +https://github.com/alexcrichton/cfg-if + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +chrono 0.4.26 - MIT/Apache-2.0 +https://github.com/chronotope/chrono + +Rust-chrono is dual-licensed under The MIT License [1] and +Apache 2.0 License [2]. Copyright (c) 2014--2017, Kang Seonghoon and +contributors. + +Nota Bene: This is same as the Rust Project's own license. + + +[1]: , which is reproduced below: + +~~~~ +The MIT License (MIT) + +Copyright (c) 2014, Kang Seonghoon. + +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. +~~~~ + + +[2]: , which is reproduced below: + +~~~~ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +~~~~ +--------------------------------------------------------- + +--------------------------------------------------------- + +clap 4.3.0 - MIT OR Apache-2.0 +https://github.com/clap-rs/clap + +Copyright (c) Individual contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +clap_builder 4.3.0 - MIT OR Apache-2.0 +https://github.com/clap-rs/clap + +Copyright (c) Individual contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +clap_derive 4.3.0 - MIT OR Apache-2.0 +https://github.com/clap-rs/clap/tree/master/clap_derive + +Copyright (c) Individual contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +clap_lex 0.5.0 - MIT OR Apache-2.0 +https://github.com/clap-rs/clap/tree/master/clap_lex + +Copyright (c) Individual contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +codespan-reporting 0.11.1 - Apache-2.0 +https://github.com/brendanzab/codespan + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--------------------------------------------------------- + +--------------------------------------------------------- + +colorchoice 1.0.0 - MIT OR Apache-2.0 +https://github.com/rust-cli/anstyle + +This software is released under the MIT license: + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +concurrent-queue 1.2.4 - Apache-2.0 OR MIT +concurrent-queue 2.2.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/concurrent-queue + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +console 0.15.7 - MIT +https://github.com/console-rs/console + +The MIT License (MIT) + +Copyright (c) 2017 Armin Ronacher + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +const_format 0.2.31 - Zlib +https://github.com/rodrimati1992/const_format_crates/ + +Copyright (c) 2020 Matias Rodriguez. + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +--------------------------------------------------------- + +--------------------------------------------------------- + +const_format_proc_macros 0.2.31 - Zlib +https://github.com/rodrimati1992/const_format_crates/ + +Copyright (c) 2020 Matias Rodriguez. + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +--------------------------------------------------------- + +--------------------------------------------------------- + +core-foundation 0.9.3 - MIT / Apache-2.0 +https://github.com/servo/core-foundation-rs + +Copyright (c) 2012-2013 Mozilla Foundation + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +core-foundation-sys 0.8.3 - MIT / Apache-2.0 +https://github.com/servo/core-foundation-rs + +Copyright (c) 2012-2013 Mozilla Foundation + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +cpufeatures 0.2.8 - MIT OR Apache-2.0 +https://github.com/RustCrypto/utils + +All crates licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260052-utils +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/utils + +[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg +[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg +[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg +[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg +[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg +[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg +[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg + +[//]: # (crates) + +[`blobby`]: ./blobby +[`block-buffer`]: ./block-buffer +[`blockā€‘padding`]: ./block-padding +[`cmov`]: ./cmov +[`collectable`]: ./collectable +[`cpufeatures`]: ./cpufeatures +[`dbl`]: ./dbl +[`hex-literal`]: ./hex-literal +[`inout`]: ./inout +[`opaque-debug`]: ./opaque-debug +[`wycheproof2blb`]: ./wycheproof2blb +[`zeroize`]: ./zeroize + +[//]: # (misc) + +[Wycheproof]: https://github.com/google/wycheproof +--------------------------------------------------------- + +--------------------------------------------------------- + +crc32fast 1.3.2 - MIT OR Apache-2.0 +https://github.com/srijs/rust-crc32fast + +MIT License + +Copyright (c) 2018 Sam Rijs, Alex Crichton and contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +crossbeam-channel 0.5.6 - MIT OR Apache-2.0 +https://github.com/crossbeam-rs/crossbeam + +The MIT License (MIT) + +Copyright (c) 2019 The Crossbeam Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +crossbeam-utils 0.8.12 - MIT OR Apache-2.0 +https://github.com/crossbeam-rs/crossbeam + +The MIT License (MIT) + +Copyright (c) 2019 The Crossbeam Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +crypto-common 0.1.6 - MIT OR Apache-2.0 +https://github.com/RustCrypto/traits + +All crates licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260050-traits +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/traits/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/traits +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg +[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg +[msrv-1.65]: https://img.shields.io/badge/rustc-1.65.0+-blue.svg + +[//]: # (crates) + +[`aead`]: ./aead +[`asyncā€‘signature`]: ./signature/async +[`cipher`]: ./cipher +[`cryptoā€‘common`]: ./crypto-common +[`crypto`]: ./crypto +[`digest`]: ./digest +[`ellipticā€‘curve`]: ./elliptic-curve +[`kem`]: ./kem +[`password-hash`]: ./password-hash +[`signature`]: ./signature +[`universalā€‘hash`]: ./universal-hash + +[//]: # (algorithms) + +[Authenticated encryption]: https://en.wikipedia.org/wiki/Authenticated_encryption +[Block]: https://en.wikipedia.org/wiki/Block_cipher +[Message authentication code]: https://en.wikipedia.org/wiki/Message_authentication_code +[Cryptographic hash function]: https://en.wikipedia.org/wiki/Cryptographic_hash_function +[Digital signature]: https://en.wikipedia.org/wiki/Digital_signature +[Elliptic curve cryptography]: https://en.wikipedia.org/wiki/Elliptic-curve_cryptography +[Key encapsulation mechanism]: https://en.wikipedia.org/wiki/Key_encapsulation +[Password hashing]: https://en.wikipedia.org/wiki/Cryptographic_hash_function#Password_verification +[Stream cipher]: https://en.wikipedia.org/wiki/Stream_cipher +[Universal hash function]: https://en.wikipedia.org/wiki/Universal_hashing +--------------------------------------------------------- + +--------------------------------------------------------- + +cxx 1.0.78 - MIT OR Apache-2.0 +https://github.com/dtolnay/cxx + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +cxx-build 1.0.78 - MIT OR Apache-2.0 +https://github.com/dtolnay/cxx + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +cxxbridge-flags 1.0.78 - MIT OR Apache-2.0 +https://github.com/dtolnay/cxx + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +cxxbridge-macro 1.0.78 - MIT OR Apache-2.0 +https://github.com/dtolnay/cxx + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +data-encoding 2.3.2 - MIT +https://github.com/ia0/data-encoding + +The MIT License (MIT) + +Copyright (c) 2015-2020 Julien Cretin +Copyright (c) 2017-2020 Google Inc. + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +derivative 2.2.0 - MIT/Apache-2.0 +https://github.com/mcarton/rust-derivative + +Copyright (c) 2016 Martin Carton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +dialoguer 0.10.4 - MIT +https://github.com/mitsuhiko/dialoguer + +The MIT License (MIT) + +Copyright (c) 2017 Armin Ronacher + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +digest 0.10.5 - MIT OR Apache-2.0 +https://github.com/RustCrypto/traits + +All crates licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260050-traits +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/traits/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/traits +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg +[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg +[msrv-1.65]: https://img.shields.io/badge/rustc-1.65.0+-blue.svg + +[//]: # (crates) + +[`aead`]: ./aead +[`asyncā€‘signature`]: ./signature/async +[`cipher`]: ./cipher +[`cryptoā€‘common`]: ./crypto-common +[`crypto`]: ./crypto +[`digest`]: ./digest +[`ellipticā€‘curve`]: ./elliptic-curve +[`kem`]: ./kem +[`password-hash`]: ./password-hash +[`signature`]: ./signature +[`universalā€‘hash`]: ./universal-hash + +[//]: # (algorithms) + +[Authenticated encryption]: https://en.wikipedia.org/wiki/Authenticated_encryption +[Block]: https://en.wikipedia.org/wiki/Block_cipher +[Message authentication code]: https://en.wikipedia.org/wiki/Message_authentication_code +[Cryptographic hash function]: https://en.wikipedia.org/wiki/Cryptographic_hash_function +[Digital signature]: https://en.wikipedia.org/wiki/Digital_signature +[Elliptic curve cryptography]: https://en.wikipedia.org/wiki/Elliptic-curve_cryptography +[Key encapsulation mechanism]: https://en.wikipedia.org/wiki/Key_encapsulation +[Password hashing]: https://en.wikipedia.org/wiki/Cryptographic_hash_function#Password_verification +[Stream cipher]: https://en.wikipedia.org/wiki/Stream_cipher +[Universal hash function]: https://en.wikipedia.org/wiki/Universal_hashing +--------------------------------------------------------- + +--------------------------------------------------------- + +dirs 4.0.0 - MIT OR Apache-2.0 +dirs 5.0.1 - MIT OR Apache-2.0 +https://github.com/dirs-dev/dirs-rs + +Copyright (c) 2018-2019 dirs-rs contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +dirs-sys 0.3.7 - MIT OR Apache-2.0 +dirs-sys 0.4.1 - MIT OR Apache-2.0 +https://github.com/dirs-dev/dirs-sys-rs + +Copyright (c) 2018-2019 dirs-rs contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +encode_unicode 0.3.6 - MIT/Apache-2.0 +https://github.com/tormol/encode_unicode + +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 +--------------------------------------------------------- + +--------------------------------------------------------- + +encoding_rs 0.8.31 - (Apache-2.0 OR MIT) AND BSD-3-Clause +https://github.com/hsivonen/encoding_rs + +Copyright Mozilla Foundation + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +enumflags2 0.7.7 - MIT OR Apache-2.0 +https://github.com/meithecatte/enumflags2 + +Copyright (c) 2017-2023 Maik Klein, Maja Kądziołka + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +enumflags2_derive 0.7.7 - MIT OR Apache-2.0 +https://github.com/meithecatte/enumflags2 + +Copyright (c) 2017-2023 Maik Klein, Maja Kądziołka + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +errno 0.3.1 - MIT OR Apache-2.0 +https://github.com/lambda-fairy/rust-errno + +Copyright (c) 2014 Chris Wong + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +errno-dragonfly 0.1.2 - MIT +https://github.com/mneumann/errno-dragonfly-rs + +MIT License + +Copyright (c) 2017 Michael Neumann + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +event-listener 2.5.3 - Apache-2.0 OR MIT +https://github.com/smol-rs/event-listener + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +fastrand 1.8.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/fastrand + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +filetime 0.2.17 - MIT/Apache-2.0 +https://github.com/alexcrichton/filetime + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +flate2 1.0.26 - MIT OR Apache-2.0 +https://github.com/rust-lang/flate2-rs + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +fnv 1.0.7 - Apache-2.0 / MIT +https://github.com/servo/rust-fnv + +Copyright (c) 2017 Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +foreign-types 0.3.2 - MIT/Apache-2.0 +https://github.com/sfackler/foreign-types + +Copyright (c) 2017 The foreign-types Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +foreign-types-shared 0.1.1 - MIT/Apache-2.0 +https://github.com/sfackler/foreign-types + +Copyright (c) 2017 The foreign-types Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +form_urlencoded 1.1.0 - MIT OR Apache-2.0 +https://github.com/servo/rust-url + +Copyright (c) 2013-2022 The rust-url developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +futures 0.3.28 - MIT OR Apache-2.0 +https://github.com/rust-lang/futures-rs + +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +futures-channel 0.3.28 - MIT OR Apache-2.0 +https://github.com/rust-lang/futures-rs + +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +futures-core 0.3.28 - MIT OR Apache-2.0 +https://github.com/rust-lang/futures-rs + +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +futures-executor 0.3.28 - MIT OR Apache-2.0 +https://github.com/rust-lang/futures-rs + +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +futures-io 0.3.28 - MIT OR Apache-2.0 +https://github.com/rust-lang/futures-rs + +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +futures-lite 1.12.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/futures-lite + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +futures-macro 0.3.28 - MIT OR Apache-2.0 +https://github.com/rust-lang/futures-rs + +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +futures-sink 0.3.28 - MIT OR Apache-2.0 +https://github.com/rust-lang/futures-rs + +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +futures-task 0.3.28 - MIT OR Apache-2.0 +https://github.com/rust-lang/futures-rs + +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +futures-util 0.3.28 - MIT OR Apache-2.0 +https://github.com/rust-lang/futures-rs + +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +generic-array 0.14.6 - MIT +https://github.com/fizyk20/generic-array + +The MIT License (MIT) + +Copyright (c) 2015 Bartłomiej Kamiński + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +gethostname 0.4.3 - Apache-2.0 +https://github.com/swsnr/gethostname.rs + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--------------------------------------------------------- + +--------------------------------------------------------- + +getrandom 0.1.16 - MIT OR Apache-2.0 +getrandom 0.2.7 - MIT OR Apache-2.0 +https://github.com/rust-random/getrandom + +Copyright 2018 Developers of the Rand project +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +h2 0.3.17 - MIT +https://github.com/hyperium/h2 + +The MIT License (MIT) + +Copyright (c) 2017 h2 authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +hashbrown 0.12.3 - MIT OR Apache-2.0 +https://github.com/rust-lang/hashbrown + +Copyright (c) 2016 Amanieu d'Antras + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +heck 0.4.0 - MIT OR Apache-2.0 +https://github.com/withoutboats/heck + +Copyright (c) 2015 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +hermit-abi 0.1.19 - MIT/Apache-2.0 +hermit-abi 0.3.1 - MIT OR Apache-2.0 +https://github.com/hermitcore/rusty-hermit + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +hex 0.4.3 - MIT OR Apache-2.0 +https://github.com/KokaKiwi/rust-hex + +Copyright (c) 2013-2014 The Rust Project Developers. +Copyright (c) 2015-2020 The rust-hex Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +hex-literal 0.3.4 - MIT OR Apache-2.0 +https://github.com/RustCrypto/utils + +All crates licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260052-utils +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/utils + +[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg +[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg +[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg +[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg +[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg +[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg +[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg + +[//]: # (crates) + +[`blobby`]: ./blobby +[`block-buffer`]: ./block-buffer +[`blockā€‘padding`]: ./block-padding +[`cmov`]: ./cmov +[`collectable`]: ./collectable +[`cpufeatures`]: ./cpufeatures +[`dbl`]: ./dbl +[`hex-literal`]: ./hex-literal +[`inout`]: ./inout +[`opaque-debug`]: ./opaque-debug +[`wycheproof2blb`]: ./wycheproof2blb +[`zeroize`]: ./zeroize + +[//]: # (misc) + +[Wycheproof]: https://github.com/google/wycheproof +--------------------------------------------------------- + +--------------------------------------------------------- + +hmac 0.12.1 - MIT OR Apache-2.0 +https://github.com/RustCrypto/MACs + +All crates licensed under either of + +* [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) +* [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260044-MACs +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/MACs/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/MACs +[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg + +[//]: # (crates) + +[`belt-mac`]: ./belt-mac +[`cbc-mac`]: ./cbc-mac +[`cmac`]: ./cmac +[`hmac`]: ./hmac +[`pmac`]: ./pmac + +[//]: # (footnotes) + +[1]: https://en.wikipedia.org/wiki/Message_authentication_code + +[//]: # (algorithms) + +[BelT MAC]: https://apmi.bsu.by/assets/files/std/belt-spec371.pdf +[CBC-MAC]: https://en.wikipedia.org/wiki/CBC-MAC +[CMAC]: https://en.wikipedia.org/wiki/One-key_MAC +[HMAC]: https://en.wikipedia.org/wiki/HMAC +[PMAC]: https://en.wikipedia.org/wiki/PMAC_(cryptography) +--------------------------------------------------------- + +--------------------------------------------------------- + +http 0.2.8 - MIT OR Apache-2.0 +https://github.com/hyperium/http + +Copyright (c) 2017 http-rs authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +http-body 0.4.5 - MIT +https://github.com/hyperium/http-body + +The MIT License (MIT) + +Copyright (c) 2019 Hyper Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +httparse 1.8.0 - MIT/Apache-2.0 +https://github.com/seanmonstar/httparse + +Copyright (c) 2015-2021 Sean McArthur + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +httpdate 1.0.2 - MIT/Apache-2.0 +https://github.com/pyfisch/httpdate + +Copyright (c) 2016 Pyfisch + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +hyper 0.14.26 - MIT +https://github.com/hyperium/hyper + +The MIT License (MIT) + +Copyright (c) 2014-2021 Sean McArthur + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +hyper-tls 0.5.0 - MIT/Apache-2.0 +https://github.com/hyperium/hyper-tls + +Copyright (c) 2017 Sean McArthur + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +iana-time-zone 0.1.51 - MIT OR Apache-2.0 +https://github.com/strawlab/iana-time-zone + +Copyright (c) 2020 Andrew D. Straw + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +iana-time-zone-haiku 0.1.0 - MIT OR Apache-2.0 +https://github.com/strawlab/iana-time-zone + +Copyright (c) 2020 Andrew D. Straw + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +idna 0.3.0 - MIT OR Apache-2.0 +https://github.com/servo/rust-url/ + +Copyright (c) 2013-2022 The rust-url developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +indexmap 1.9.1 - Apache-2.0 OR MIT +https://github.com/bluss/indexmap + +Copyright (c) 2016--2017 + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +indicatif 0.17.4 - MIT +https://github.com/console-rs/indicatif + +The MIT License (MIT) + +Copyright (c) 2017 Armin Ronacher + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +inout 0.1.3 - MIT OR Apache-2.0 +https://github.com/RustCrypto/utils + +All crates licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260052-utils +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/utils + +[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg +[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg +[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg +[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg +[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg +[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg +[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg + +[//]: # (crates) + +[`blobby`]: ./blobby +[`block-buffer`]: ./block-buffer +[`blockā€‘padding`]: ./block-padding +[`cmov`]: ./cmov +[`collectable`]: ./collectable +[`cpufeatures`]: ./cpufeatures +[`dbl`]: ./dbl +[`hex-literal`]: ./hex-literal +[`inout`]: ./inout +[`opaque-debug`]: ./opaque-debug +[`wycheproof2blb`]: ./wycheproof2blb +[`zeroize`]: ./zeroize + +[//]: # (misc) + +[Wycheproof]: https://github.com/google/wycheproof +--------------------------------------------------------- + +--------------------------------------------------------- + +instant 0.1.12 - BSD-3-Clause +https://github.com/sebcrozet/instant + +Copyright (c) 2019, SĆ©bastien Crozet +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the author nor the names of its contributors may be used + to endorse or promote products derived from this software without specific + prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--------------------------------------------------------- + +--------------------------------------------------------- + +io-lifetimes 1.0.11 - Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +https://github.com/sunfishcode/io-lifetimes + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +ipnet 2.5.0 - MIT OR Apache-2.0 +https://github.com/krisprice/ipnet + +Copyright 2017 Juniper Networks, Inc. + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +is-docker 0.2.0 - MIT +https://github.com/TheLarkInn/is-docker + +MIT License + +Copyright (c) 2023 Sean Larkin + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +is-terminal 0.4.7 - MIT +https://github.com/sunfishcode/is-terminal + +The MIT License (MIT) + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +is-wsl 0.4.0 - MIT +https://github.com/TheLarkInn/is-wsl + +MIT License + +Copyright (c) 2023 Sean Larkin + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +itoa 1.0.4 - MIT OR Apache-2.0 +https://github.com/dtolnay/itoa + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +js-sys 0.3.60 - MIT/Apache-2.0 +https://github.com/rustwasm/wasm-bindgen/tree/master/crates/js-sys + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +keyring 2.0.3 - MIT OR Apache-2.0 +https://github.com/hwchen/keyring-rs + +Copyright (c) 2016 keyring Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +lazy_static 1.4.0 - MIT/Apache-2.0 +https://github.com/rust-lang-nursery/lazy-static.rs + +Copyright (c) 2010 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +libc 0.2.144 - MIT OR Apache-2.0 +https://github.com/rust-lang/libc + +Copyright (c) 2014-2020 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +link-cplusplus 1.0.7 - MIT OR Apache-2.0 +https://github.com/dtolnay/link-cplusplus + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +linux-keyutils 0.2.3 - Apache-2.0 OR MIT +https://github.com/landhb/linux-keyutils + +Licensed under either of the following at your discretion: + + * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) + * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you shall be dual licensed as above, without any +additional terms or conditions. + +[//]: # (badges) +[license-badge]: https://img.shields.io/badge/license-MIT/Apache--2.0-lightgray.svg?style=flat-square +[license]: #license +[rust-version-badge]: https://img.shields.io/badge/rust-latest%20stable-blue.svg?style=flat-square +[rust-version]: #rust-version-policy +[cargo-badge-lib]: https://img.shields.io/crates/v/linux-keyutils.svg?style=flat-square&label=linux-keyutils +[cargo-lib]: https://crates.io/crates/linux-keyutils +[docs-badge-lib]: https://img.shields.io/docsrs/linux-keyutils/latest?style=flat-square +[docs-lib]: https://docs.rs/linux-keyutils +[codecov]: https://img.shields.io/codecov/c/github/landhb/linux-keyutils?style=flat-square +[codecov-url]: https://codecov.io/gh/landhb/linux-keyutils +[build]: https://img.shields.io/github/actions/workflow/status/landhb/linux-keyutils/checks.yml?branch=main&style=flat-square +[build-url]: https://github.com/landhb/linux-keyutils/actions?query=workflow%3Achecks +--------------------------------------------------------- + +--------------------------------------------------------- + +linux-raw-sys 0.3.8 - Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +https://github.com/sunfishcode/linux-raw-sys + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +lock_api 0.4.9 - MIT OR Apache-2.0 +https://github.com/Amanieu/parking_lot + +Copyright (c) 2016 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +log 0.4.18 - MIT OR Apache-2.0 +https://github.com/rust-lang/log + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +md5 0.7.0 - Apache-2.0/MIT +https://github.com/stainless-steel/md5 + +The project is dual licensed under the terms of the Apache License, Version 2.0, +and the MIT License. You may obtain copies of the two licenses at + +* https://www.apache.org/licenses/LICENSE-2.0 and +* https://opensource.org/licenses/MIT, respectively. + +The following two notices apply to every file of the project. + +## The Apache License + +``` +Copyright 2015ā€“2019 The md5 Developers + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use +this file except in compliance with the License. You may obtain a copy of the +License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. +``` + +## The MIT License + +``` +Copyright 2015ā€“2019 The md5 Developers + +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. +``` +--------------------------------------------------------- + +--------------------------------------------------------- + +memchr 2.5.0 - Unlicense/MIT +https://github.com/BurntSushi/memchr + +The MIT License (MIT) + +Copyright (c) 2015 Andrew Gallant + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +memoffset 0.7.1 - MIT +https://github.com/Gilnaa/memoffset + +The MIT License (MIT) + +Copyright (c) 2017 Gilad Naaman + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +mime 0.3.16 - MIT/Apache-2.0 +https://github.com/hyperium/mime + +Copyright (c) 2014-2019 Sean McArthur + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +miniz_oxide 0.7.1 - MIT OR Zlib OR Apache-2.0 +https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide + +This library (excluding the miniz C code used for tests) is licensed under the MIT license. The library is based on the miniz C library, of which the parts used are dual-licensed under the [MIT license](https://github.com/Frommi/miniz_oxide/blob/master/miniz/miniz.c#L1) and also the [unlicense](https://github.com/Frommi/miniz_oxide/blob/master/miniz/miniz.c#L577). +The parts of miniz that are not covered by the unlicense is [some Zip64 code](https://github.com/richgel999/miniz/commit/224d207ce8fffb908e156d27478be3afb5d83e6a#diff-edc0e9ccfae3b5324b85b3ec0a53dc74) which is only MIT licensed. This and other Zip functionality in miniz is not part of the miniz_oxidde and miniz_oxide_c_api rust libraries. +--------------------------------------------------------- + +--------------------------------------------------------- + +mio 0.8.4 - MIT +https://github.com/tokio-rs/mio + +The MIT License (MIT) + +Copyright (c) 2014 Carl Lerche and other MIO contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +native-tls 0.2.10 - MIT/Apache-2.0 +https://github.com/sfackler/rust-native-tls + +Copyright (c) 2016 The rust-native-tls Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +nix 0.26.2 - MIT +https://github.com/nix-rust/nix + +The MIT License (MIT) + +Copyright (c) 2015 Carl Lerche + nix-rust Authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +ntapi 0.4.0 - Apache-2.0 OR MIT +https://github.com/MSxDOS/ntapi + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +num 0.4.0 - MIT OR Apache-2.0 +https://github.com/rust-num/num + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +num-bigint 0.4.3 - MIT OR Apache-2.0 +https://github.com/rust-num/num-bigint + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +num-complex 0.4.2 - MIT OR Apache-2.0 +https://github.com/rust-num/num-complex + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +num-integer 0.1.45 - MIT OR Apache-2.0 +https://github.com/rust-num/num-integer + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +num-iter 0.1.43 - MIT OR Apache-2.0 +https://github.com/rust-num/num-iter + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +num-rational 0.4.1 - MIT OR Apache-2.0 +https://github.com/rust-num/num-rational + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +num-traits 0.2.15 - MIT OR Apache-2.0 +https://github.com/rust-num/num-traits + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +num_cpus 1.13.1 - MIT OR Apache-2.0 +https://github.com/seanmonstar/num_cpus + +Copyright (c) 2015 + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +number_prefix 0.4.0 - MIT +https://github.com/ogham/rust-number-prefix + +MIT License + +Copyright (c) 2018 Benjamin Sago + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +once_cell 1.17.2 - MIT OR Apache-2.0 +https://github.com/matklad/once_cell + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +open 4.1.0 - MIT +https://github.com/Byron/open-rs + +The MIT License (MIT) + +Copyright Ā© `2015` `Sebastian Thiel` + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +openssl 0.10.55 - Apache-2.0 +https://github.com/sfackler/rust-openssl + +Copyright 2011-2017 Google Inc. + 2013 Jack Lloyd + 2013-2014 Steven Fackler + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--------------------------------------------------------- + +--------------------------------------------------------- + +openssl-macros 0.1.0 - MIT/Apache-2.0 + + +This software is released under the MIT license: + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +openssl-probe 0.1.5 - MIT/Apache-2.0 +https://github.com/alexcrichton/openssl-probe + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +openssl-sys 0.9.90 - MIT +https://github.com/sfackler/rust-openssl + +The MIT License (MIT) + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +opentelemetry 0.19.0 - Apache-2.0 +https://github.com/open-telemetry/opentelemetry-rust + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright The OpenTelemetry Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--------------------------------------------------------- + +--------------------------------------------------------- + +opentelemetry_api 0.19.0 - Apache-2.0 +https://github.com/open-telemetry/opentelemetry-rust + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright The OpenTelemetry Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--------------------------------------------------------- + +--------------------------------------------------------- + +opentelemetry_sdk 0.19.0 - Apache-2.0 +https://github.com/open-telemetry/opentelemetry-rust + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright The OpenTelemetry Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--------------------------------------------------------- + +--------------------------------------------------------- + +option-ext 0.2.0 - MPL-2.0 +https://github.com/soc/option-ext + +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at https://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. +--------------------------------------------------------- + +--------------------------------------------------------- + +ordered-stream 0.2.0 - MIT OR Apache-2.0 +https://github.com/danieldg/ordered-stream + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +parking 2.0.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/parking + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +parking_lot 0.12.1 - MIT OR Apache-2.0 +https://github.com/Amanieu/parking_lot + +Copyright (c) 2016 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +parking_lot_core 0.9.3 - MIT OR Apache-2.0 +https://github.com/Amanieu/parking_lot + +Copyright (c) 2016 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +paste 1.0.9 - MIT OR Apache-2.0 +https://github.com/dtolnay/paste + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +pathdiff 0.2.1 - MIT/Apache-2.0 +https://github.com/Manishearth/pathdiff + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +percent-encoding 2.2.0 - MIT OR Apache-2.0 +https://github.com/servo/rust-url/ + +Copyright (c) 2013-2022 The rust-url developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +pin-project 1.1.0 - Apache-2.0 OR MIT +https://github.com/taiki-e/pin-project + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +pin-project-internal 1.1.0 - Apache-2.0 OR MIT +https://github.com/taiki-e/pin-project + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +pin-project-lite 0.2.9 - Apache-2.0 OR MIT +https://github.com/taiki-e/pin-project-lite + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +pin-utils 0.1.0 - MIT OR Apache-2.0 +https://github.com/rust-lang/pin-utils + +Copyright (c) 2018 The pin-utils authors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +pkg-config 0.3.25 - MIT OR Apache-2.0 +https://github.com/rust-lang/pkg-config-rs + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +polling 2.3.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/polling + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +portable-atomic 1.3.3 - Apache-2.0 OR MIT +https://github.com/taiki-e/portable-atomic + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +ppv-lite86 0.2.16 - MIT/Apache-2.0 +https://github.com/cryptocorrosion/cryptocorrosion + +Copyright (c) 2019 The CryptoCorrosion Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +proc-macro-crate 1.2.1 - Apache-2.0/MIT +https://github.com/bkchr/proc-macro-crate + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +proc-macro2 1.0.59 - MIT OR Apache-2.0 +https://github.com/dtolnay/proc-macro2 + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +quote 1.0.28 - MIT OR Apache-2.0 +https://github.com/dtolnay/quote + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +rand 0.7.3 - MIT OR Apache-2.0 +rand 0.8.5 - MIT OR Apache-2.0 +https://github.com/rust-random/rand + +Copyright 2018 Developers of the Rand project +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +rand_chacha 0.2.2 - MIT OR Apache-2.0 +rand_chacha 0.3.1 - MIT OR Apache-2.0 +https://github.com/rust-random/rand + +Copyright 2018 Developers of the Rand project +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +rand_core 0.5.1 - MIT OR Apache-2.0 +rand_core 0.6.4 - MIT OR Apache-2.0 +https://github.com/rust-random/rand + +Copyright 2018 Developers of the Rand project +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +rand_hc 0.2.0 - MIT/Apache-2.0 +https://github.com/rust-random/rngs + +Copyright 2018 Developers of the Rand project +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +redox_syscall 0.2.16 - MIT +redox_syscall 0.3.5 - MIT +https://github.com/redox-os/syscall + +Copyright (c) 2017 Redox OS Developers + +MIT License + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +redox_users 0.4.3 - MIT +https://gitlab.redox-os.org/redox-os/users + +The MIT License (MIT) + +Copyright (c) 2017 Jose Narvaez + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +regex 1.8.3 - MIT OR Apache-2.0 +https://github.com/rust-lang/regex + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +regex-syntax 0.7.2 - MIT OR Apache-2.0 +https://github.com/rust-lang/regex/tree/master/regex-syntax + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +reqwest 0.11.18 - MIT OR Apache-2.0 +https://github.com/seanmonstar/reqwest + +Copyright (c) 2016 Sean McArthur + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +rmp 0.8.11 - MIT +https://github.com/3Hren/msgpack-rust + +MIT License + +Copyright (c) 2017 Evgeny Safronov + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +rmp-serde 1.1.1 - MIT +https://github.com/3Hren/msgpack-rust + +MIT License + +Copyright (c) 2017 Evgeny Safronov + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +russh 6a15199c784c0b6d171a6fec09ed730a5cd1350d +https://github.com/microsoft/vscode-russh + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--------------------------------------------------------- + +--------------------------------------------------------- + +russh-cryptovec 6a15199c784c0b6d171a6fec09ed730a5cd1350d +https://github.com/microsoft/vscode-russh + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--------------------------------------------------------- + +--------------------------------------------------------- + +russh-keys 6a15199c784c0b6d171a6fec09ed730a5cd1350d +https://github.com/microsoft/vscode-russh + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--------------------------------------------------------- + +--------------------------------------------------------- + +rustix 0.37.19 - Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +https://github.com/bytecodealliance/rustix + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +ryu 1.0.11 - Apache-2.0 OR BSL-1.0 +https://github.com/dtolnay/ryu + + +Licensed under either of Apache License, Version +2.0 (LICENSE-APACHE) or Boost Software License 1.0 (LICENSE-BOOST) at your +option. + + +
+ + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in this crate by you, as defined in the Apache-2.0 license, shall +be dual licensed as above, without any additional terms or conditions. + +--------------------------------------------------------- + +--------------------------------------------------------- + +schannel 0.1.20 - MIT +https://github.com/steffengy/schannel-rs + +The MIT License (MIT) + +Copyright (c) 2015 steffengy + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +scopeguard 1.1.0 - MIT/Apache-2.0 +https://github.com/bluss/scopeguard + +Copyright (c) 2016-2019 Ulrik Sverdrup "bluss" and scopeguard developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +scratch 1.0.2 - MIT OR Apache-2.0 +https://github.com/dtolnay/scratch + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +secret-service 3.0.1 - MIT OR Apache-2.0 +https://github.com/hwchen/secret-service-rs + +Copyright (c) 2016 secret-service Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +security-framework 2.7.0 - MIT OR Apache-2.0 +https://github.com/kornelski/rust-security-framework + +The MIT License (MIT) + +Copyright (c) 2015 Steven Fackler + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +security-framework-sys 2.6.1 - MIT OR Apache-2.0 +https://github.com/kornelski/rust-security-framework + +The MIT License (MIT) + +Copyright (c) 2015 Steven Fackler + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +serde 1.0.163 - MIT OR Apache-2.0 +https://github.com/serde-rs/serde + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +serde_bytes 0.11.9 - MIT OR Apache-2.0 +https://github.com/serde-rs/bytes + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +serde_derive 1.0.163 - MIT OR Apache-2.0 +https://github.com/serde-rs/serde + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +serde_json 1.0.96 - MIT OR Apache-2.0 +https://github.com/serde-rs/json + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +serde_repr 0.1.9 - MIT OR Apache-2.0 +https://github.com/dtolnay/serde-repr + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +serde_urlencoded 0.7.1 - MIT/Apache-2.0 +https://github.com/nox/serde_urlencoded + +Copyright (c) 2016 Anthony Ramine + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +sha-1 0.10.0 - MIT OR Apache-2.0 +https://github.com/RustCrypto/hashes + +All crates licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260041-hashes +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/hashes/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/hashes +[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg + +[//]: # (crates) + +[`asconā€‘hash`]: ./ascon-hash +[`beltā€‘hash`]: ./belt-hash +[`blake2`]: ./blake2 +[`fsb`]: ./fsb +[`gost94`]: ./gost94 +[`groestl`]: ./groestl +[`jh`]: ./jh +[`k12`]: ./k12 +[`md2`]: ./md2 +[`md4`]: ./md4 +[`md5`]: ./md5 +[`ripemd`]: ./ripemd +[`sha1`]: ./sha1 +[`sha2`]: ./sha2 +[`sha3`]: ./sha3 +[`shabal`]: ./shabal +[`skein`]: ./skein +[`sm3`]: ./sm3 +[`streebog`]: ./streebog +[`tiger`]: ./tiger +[`whirlpool`]: ./whirlpool + +[//]: # (footnotes) + +[1]: https://en.wikipedia.org/wiki/Cryptographic_hash_function +[`blake3`]: https://github.com/BLAKE3-team/BLAKE3 +[`base16ct`]: https://docs.rs/base16ct +[`base64ct`]: https://docs.rs/base64ct +[`digest`]: https://docs.rs/digest +[`Digest`]: https://docs.rs/digest/0.10.0/digest/trait.Digest.html +[`Digest::digest`]: https://docs.rs/digest/0.10.0/digest/trait.Digest.html#tymethod.digest +[`DynDigest`]: https://docs.rs/digest/0.10.0/digest/trait.DynDigest.html +[`generic-array`]: https://docs.rs/generic-array +[HMAC]: https://en.wikipedia.org/wiki/Hash-based_message_authentication_code +[`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html +[`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html +[`hmac`]: https://docs.rs/hmac +[RustCrypto/MACs]: https://github.com/RustCrypto/MACs + +[//]: # (algorithms) + +[Ascon]: https://ascon.iaik.tugraz.at +[BelT]: https://ru.wikipedia.org/wiki/BelT +[BLAKE2]: https://en.wikipedia.org/wiki/BLAKE_(hash_function)#BLAKE2 +[FSB]: https://en.wikipedia.org/wiki/Fast_syndrome-based_hash +[GOST94]: https://en.wikipedia.org/wiki/GOST_(hash_function) +[GrĆøstl]: https://en.wikipedia.org/wiki/GrĆøstl +[JH]: https://www3.ntu.edu.sg/home/wuhj/research/jh +[KangarooTwelve]: https://keccak.team/kangarootwelve.html +[MD2]: https://en.wikipedia.org/wiki/MD2_(cryptography) +[MD4]: https://en.wikipedia.org/wiki/MD4 +[MD5]: https://en.wikipedia.org/wiki/MD5 +[RIPEMD]: https://en.wikipedia.org/wiki/RIPEMD +[SHA-1]: https://en.wikipedia.org/wiki/SHA-1 +[SHA-2]: https://en.wikipedia.org/wiki/SHA-2 +[SHA-3]: https://en.wikipedia.org/wiki/SHA-3 +[SHABAL]: https://www.cs.rit.edu/~ark/20090927/Round2Candidates/Shabal.pdf +[Skein]: https://schneier.com/academic/skein +[SM3]: https://en.wikipedia.org/wiki/SM3_(hash_function) +[Streebog]: https://en.wikipedia.org/wiki/Streebog +[Whirlpool]: https://en.wikipedia.org/wiki/Whirlpool_(cryptography) +[Tiger]: http://www.cs.technion.ac.il/~biham/Reports/Tiger/tiger/tiger.html +--------------------------------------------------------- + +--------------------------------------------------------- + +sha1 0.10.5 - MIT OR Apache-2.0 +https://github.com/RustCrypto/hashes + +All crates licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260041-hashes +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/hashes/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/hashes +[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg + +[//]: # (crates) + +[`asconā€‘hash`]: ./ascon-hash +[`beltā€‘hash`]: ./belt-hash +[`blake2`]: ./blake2 +[`fsb`]: ./fsb +[`gost94`]: ./gost94 +[`groestl`]: ./groestl +[`jh`]: ./jh +[`k12`]: ./k12 +[`md2`]: ./md2 +[`md4`]: ./md4 +[`md5`]: ./md5 +[`ripemd`]: ./ripemd +[`sha1`]: ./sha1 +[`sha2`]: ./sha2 +[`sha3`]: ./sha3 +[`shabal`]: ./shabal +[`skein`]: ./skein +[`sm3`]: ./sm3 +[`streebog`]: ./streebog +[`tiger`]: ./tiger +[`whirlpool`]: ./whirlpool + +[//]: # (footnotes) + +[1]: https://en.wikipedia.org/wiki/Cryptographic_hash_function +[`blake3`]: https://github.com/BLAKE3-team/BLAKE3 +[`base16ct`]: https://docs.rs/base16ct +[`base64ct`]: https://docs.rs/base64ct +[`digest`]: https://docs.rs/digest +[`Digest`]: https://docs.rs/digest/0.10.0/digest/trait.Digest.html +[`Digest::digest`]: https://docs.rs/digest/0.10.0/digest/trait.Digest.html#tymethod.digest +[`DynDigest`]: https://docs.rs/digest/0.10.0/digest/trait.DynDigest.html +[`generic-array`]: https://docs.rs/generic-array +[HMAC]: https://en.wikipedia.org/wiki/Hash-based_message_authentication_code +[`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html +[`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html +[`hmac`]: https://docs.rs/hmac +[RustCrypto/MACs]: https://github.com/RustCrypto/MACs + +[//]: # (algorithms) + +[Ascon]: https://ascon.iaik.tugraz.at +[BelT]: https://ru.wikipedia.org/wiki/BelT +[BLAKE2]: https://en.wikipedia.org/wiki/BLAKE_(hash_function)#BLAKE2 +[FSB]: https://en.wikipedia.org/wiki/Fast_syndrome-based_hash +[GOST94]: https://en.wikipedia.org/wiki/GOST_(hash_function) +[GrĆøstl]: https://en.wikipedia.org/wiki/GrĆøstl +[JH]: https://www3.ntu.edu.sg/home/wuhj/research/jh +[KangarooTwelve]: https://keccak.team/kangarootwelve.html +[MD2]: https://en.wikipedia.org/wiki/MD2_(cryptography) +[MD4]: https://en.wikipedia.org/wiki/MD4 +[MD5]: https://en.wikipedia.org/wiki/MD5 +[RIPEMD]: https://en.wikipedia.org/wiki/RIPEMD +[SHA-1]: https://en.wikipedia.org/wiki/SHA-1 +[SHA-2]: https://en.wikipedia.org/wiki/SHA-2 +[SHA-3]: https://en.wikipedia.org/wiki/SHA-3 +[SHABAL]: https://www.cs.rit.edu/~ark/20090927/Round2Candidates/Shabal.pdf +[Skein]: https://schneier.com/academic/skein +[SM3]: https://en.wikipedia.org/wiki/SM3_(hash_function) +[Streebog]: https://en.wikipedia.org/wiki/Streebog +[Whirlpool]: https://en.wikipedia.org/wiki/Whirlpool_(cryptography) +[Tiger]: http://www.cs.technion.ac.il/~biham/Reports/Tiger/tiger/tiger.html +--------------------------------------------------------- + +--------------------------------------------------------- + +sha2 0.10.6 - MIT OR Apache-2.0 +https://github.com/RustCrypto/hashes + +All crates licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260041-hashes +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/hashes/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/hashes +[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg + +[//]: # (crates) + +[`asconā€‘hash`]: ./ascon-hash +[`beltā€‘hash`]: ./belt-hash +[`blake2`]: ./blake2 +[`fsb`]: ./fsb +[`gost94`]: ./gost94 +[`groestl`]: ./groestl +[`jh`]: ./jh +[`k12`]: ./k12 +[`md2`]: ./md2 +[`md4`]: ./md4 +[`md5`]: ./md5 +[`ripemd`]: ./ripemd +[`sha1`]: ./sha1 +[`sha2`]: ./sha2 +[`sha3`]: ./sha3 +[`shabal`]: ./shabal +[`skein`]: ./skein +[`sm3`]: ./sm3 +[`streebog`]: ./streebog +[`tiger`]: ./tiger +[`whirlpool`]: ./whirlpool + +[//]: # (footnotes) + +[1]: https://en.wikipedia.org/wiki/Cryptographic_hash_function +[`blake3`]: https://github.com/BLAKE3-team/BLAKE3 +[`base16ct`]: https://docs.rs/base16ct +[`base64ct`]: https://docs.rs/base64ct +[`digest`]: https://docs.rs/digest +[`Digest`]: https://docs.rs/digest/0.10.0/digest/trait.Digest.html +[`Digest::digest`]: https://docs.rs/digest/0.10.0/digest/trait.Digest.html#tymethod.digest +[`DynDigest`]: https://docs.rs/digest/0.10.0/digest/trait.DynDigest.html +[`generic-array`]: https://docs.rs/generic-array +[HMAC]: https://en.wikipedia.org/wiki/Hash-based_message_authentication_code +[`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html +[`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html +[`hmac`]: https://docs.rs/hmac +[RustCrypto/MACs]: https://github.com/RustCrypto/MACs + +[//]: # (algorithms) + +[Ascon]: https://ascon.iaik.tugraz.at +[BelT]: https://ru.wikipedia.org/wiki/BelT +[BLAKE2]: https://en.wikipedia.org/wiki/BLAKE_(hash_function)#BLAKE2 +[FSB]: https://en.wikipedia.org/wiki/Fast_syndrome-based_hash +[GOST94]: https://en.wikipedia.org/wiki/GOST_(hash_function) +[GrĆøstl]: https://en.wikipedia.org/wiki/GrĆøstl +[JH]: https://www3.ntu.edu.sg/home/wuhj/research/jh +[KangarooTwelve]: https://keccak.team/kangarootwelve.html +[MD2]: https://en.wikipedia.org/wiki/MD2_(cryptography) +[MD4]: https://en.wikipedia.org/wiki/MD4 +[MD5]: https://en.wikipedia.org/wiki/MD5 +[RIPEMD]: https://en.wikipedia.org/wiki/RIPEMD +[SHA-1]: https://en.wikipedia.org/wiki/SHA-1 +[SHA-2]: https://en.wikipedia.org/wiki/SHA-2 +[SHA-3]: https://en.wikipedia.org/wiki/SHA-3 +[SHABAL]: https://www.cs.rit.edu/~ark/20090927/Round2Candidates/Shabal.pdf +[Skein]: https://schneier.com/academic/skein +[SM3]: https://en.wikipedia.org/wiki/SM3_(hash_function) +[Streebog]: https://en.wikipedia.org/wiki/Streebog +[Whirlpool]: https://en.wikipedia.org/wiki/Whirlpool_(cryptography) +[Tiger]: http://www.cs.technion.ac.il/~biham/Reports/Tiger/tiger/tiger.html +--------------------------------------------------------- + +--------------------------------------------------------- + +shell-escape 0.1.5 - MIT/Apache-2.0 +https://github.com/sfackler/shell-escape + +Copyright (c) 2014 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +shell-words 1.1.0 - MIT/Apache-2.0 +https://github.com/tmiasko/shell-words + +Copyright (c) 2016 Tomasz Miąsko + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +signal-hook 0.3.15 - Apache-2.0/MIT +https://github.com/vorner/signal-hook + +Copyright (c) 2017 tokio-jsonrpc developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +signal-hook-registry 1.4.0 - Apache-2.0/MIT +https://github.com/vorner/signal-hook + +Copyright (c) 2017 tokio-jsonrpc developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +slab 0.4.7 - MIT +https://github.com/tokio-rs/slab + +The MIT License (MIT) + +Copyright (c) 2019 Carl Lerche + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +smallvec 1.10.0 - MIT OR Apache-2.0 +https://github.com/servo/rust-smallvec + +Copyright (c) 2018 The Servo Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +socket2 0.4.9 - MIT OR Apache-2.0 +https://github.com/rust-lang/socket2 + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +static_assertions 1.1.0 - MIT OR Apache-2.0 +https://github.com/nvzqz/static-assertions-rs + +MIT License + +Copyright (c) 2017 Nikolai Vazquez + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +strsim 0.10.0 - MIT +https://github.com/dguo/strsim-rs + +The MIT License (MIT) + +Copyright (c) 2015 Danny Guo +Copyright (c) 2016 Titus Wormer +Copyright (c) 2018 Akash Kurdekar + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +subtle 2.4.1 - BSD-3-Clause +https://github.com/dalek-cryptography/subtle + +Copyright (c) 2016-2017 Isis Agora Lovecruft, Henry de Valence. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--------------------------------------------------------- + +--------------------------------------------------------- + +syn 1.0.103 - MIT OR Apache-2.0 +syn 2.0.18 - MIT OR Apache-2.0 +https://github.com/dtolnay/syn + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +sysinfo 0.29.0 - MIT +https://github.com/GuillaumeGomez/sysinfo + +The MIT License (MIT) + +Copyright (c) 2015 Guillaume Gomez + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tar 0.4.38 - MIT/Apache-2.0 +https://github.com/alexcrichton/tar-rs + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tempfile 3.5.0 - MIT OR Apache-2.0 +https://github.com/Stebalien/tempfile + +Copyright (c) 2015 Steven Allen + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +termcolor 1.1.3 - Unlicense OR MIT +https://github.com/BurntSushi/termcolor + +The MIT License (MIT) + +Copyright (c) 2015 Andrew Gallant + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +thiserror 1.0.40 - MIT OR Apache-2.0 +https://github.com/dtolnay/thiserror + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +thiserror-impl 1.0.40 - MIT OR Apache-2.0 +https://github.com/dtolnay/thiserror + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +time 0.1.44 - MIT/Apache-2.0 +time 0.3.21 - MIT OR Apache-2.0 +https://github.com/time-rs/time + +Copyright (c) 2022 Jacob Pratt et al. + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +time-core 0.1.1 - MIT OR Apache-2.0 +https://github.com/time-rs/time + +Copyright (c) 2022 Jacob Pratt et al. + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tinyvec 1.6.0 - Zlib OR Apache-2.0 OR MIT +https://github.com/Lokathor/tinyvec + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tinyvec_macros 0.1.0 - MIT OR Apache-2.0 OR Zlib +https://github.com/Soveu/tinyvec_macros + +MIT License + +Copyright (c) 2020 Soveu + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tokio 1.28.2 - MIT +https://github.com/tokio-rs/tokio + +The MIT License (MIT) + +Copyright (c) 2023 Tokio Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tokio-macros 2.1.0 - MIT +https://github.com/tokio-rs/tokio + +The MIT License (MIT) + +Copyright (c) 2023 Tokio Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tokio-native-tls 0.3.0 - MIT +https://github.com/tokio-rs/tls + +The MIT License (MIT) + +Copyright (c) 2019 Tokio Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tokio-stream 0.1.11 - MIT +https://github.com/tokio-rs/tokio + +The MIT License (MIT) + +Copyright (c) 2023 Tokio Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tokio-tungstenite 0.17.2 - MIT +https://github.com/snapview/tokio-tungstenite + +The MIT License (MIT) + +Copyright (c) 2017 Daniel Abramov +Copyright (c) 2017 Alexey Galakhov + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tokio-util 0.7.8 - MIT +https://github.com/tokio-rs/tokio + +The MIT License (MIT) + +Copyright (c) 2023 Tokio Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +toml 0.5.9 - MIT/Apache-2.0 +https://github.com/toml-rs/toml + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tower-service 0.3.2 - MIT +https://github.com/tower-rs/tower + +The MIT License (MIT) + +Copyright (c) 2019 Tower Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tracing 0.1.37 - MIT +https://github.com/tokio-rs/tracing + +The MIT License (MIT) + +Copyright (c) 2019 Tokio Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tracing-attributes 0.1.23 - MIT +https://github.com/tokio-rs/tracing + +The MIT License (MIT) + +Copyright (c) 2019 Tokio Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tracing-core 0.1.30 - MIT +https://github.com/tokio-rs/tracing + +The MIT License (MIT) + +Copyright (c) 2019 Tokio Contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +try-lock 0.2.3 - MIT +https://github.com/seanmonstar/try-lock + +The MIT License (MIT) + +Copyright (c) 2018 Sean McArthur +Copyright (c) 2016 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tungstenite 0.17.3 - MIT/Apache-2.0 +https://github.com/snapview/tungstenite-rs + +Copyright (c) 2017 Alexey Galakhov +Copyright (c) 2016 Jason Housley + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +tunnels 2621784a9ad72aa39500372391332a14bad581a3 +https://github.com/microsoft/dev-tunnels + +MIT License + + Copyright (c) Microsoft Corporation. + + 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 +--------------------------------------------------------- + +--------------------------------------------------------- + +typenum 1.15.0 - MIT OR Apache-2.0 +https://github.com/paholg/typenum + +MIT OR Apache-2.0 +--------------------------------------------------------- + +--------------------------------------------------------- + +uds_windows 1.0.2 - MIT +https://github.com/haraldh/rust_uds_windows + +MIT License + + Copyright (c) Microsoft Corporation. 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 +--------------------------------------------------------- + +--------------------------------------------------------- + +unicode-bidi 0.3.8 - MIT OR Apache-2.0 +https://github.com/servo/unicode-bidi + +Copyright (c) 2015 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +unicode-ident 1.0.5 - (MIT OR Apache-2.0) AND Unicode-DFS-2016 +https://github.com/dtolnay/unicode-ident + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +unicode-normalization 0.1.22 - MIT/Apache-2.0 +https://github.com/unicode-rs/unicode-normalization + +Copyright (c) 2015 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +unicode-width 0.1.10 - MIT/Apache-2.0 +https://github.com/unicode-rs/unicode-width + +Copyright (c) 2015 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +unicode-xid 0.2.4 - MIT OR Apache-2.0 +https://github.com/unicode-rs/unicode-xid + +Copyright (c) 2015 The Rust Project Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +url 2.3.1 - MIT OR Apache-2.0 +https://github.com/servo/rust-url + +Copyright (c) 2013-2022 The rust-url developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +urlencoding 2.1.2 - MIT +https://github.com/kornelski/rust_urlencoding + +The MIT License (MIT) + +Ā© 2016 Bertram Truong +Ā© 2021 Kornel Lesiński + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +utf-8 0.7.6 - MIT OR Apache-2.0 +https://github.com/SimonSapin/rust-utf8 + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +utf8parse 0.2.1 - Apache-2.0 OR MIT +https://github.com/alacritty/vte + +Copyright (c) 2016 Joe Wilm + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +uuid 0.8.2 - Apache-2.0 OR MIT +uuid 1.3.3 - Apache-2.0 OR MIT +https://github.com/uuid-rs/uuid + +Copyright (c) 2014 The Rust Project Developers +Copyright (c) 2018 Ashley Mannix, Christopher Armstrong, Dylan DPC, Hunar Roop Kahlon + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +vcpkg 0.2.15 - MIT/Apache-2.0 +https://github.com/mcgoo/vcpkg-rs + +Copyright (c) 2017 Jim McGrath + +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_check 0.9.4 - MIT/Apache-2.0 +https://github.com/SergioBenitez/version_check + +The MIT License (MIT) +Copyright (c) 2017-2018 Sergio Benitez + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +waker-fn 1.1.0 - Apache-2.0 OR MIT +https://github.com/smol-rs/waker-fn + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +want 0.3.0 - MIT +https://github.com/seanmonstar/want + +The MIT License (MIT) + +Copyright (c) 2018-2019 Sean McArthur + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +wasi 0.10.0+wasi-snapshot-preview1 - Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +wasi 0.11.0+wasi-snapshot-preview1 - Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +wasi 0.9.0+wasi-snapshot-preview1 - Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +https://github.com/bytecodealliance/wasi + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +wasm-bindgen 0.2.83 - MIT/Apache-2.0 +https://github.com/rustwasm/wasm-bindgen + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +wasm-bindgen-backend 0.2.83 - MIT/Apache-2.0 +https://github.com/rustwasm/wasm-bindgen/tree/master/crates/backend + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +wasm-bindgen-futures 0.4.33 - MIT/Apache-2.0 +https://github.com/rustwasm/wasm-bindgen/tree/master/crates/futures + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +wasm-bindgen-macro 0.2.83 - MIT/Apache-2.0 +https://github.com/rustwasm/wasm-bindgen/tree/master/crates/macro + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +wasm-bindgen-macro-support 0.2.83 - MIT/Apache-2.0 +https://github.com/rustwasm/wasm-bindgen/tree/master/crates/macro-support + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +wasm-bindgen-shared 0.2.83 - MIT/Apache-2.0 +https://github.com/rustwasm/wasm-bindgen/tree/master/crates/shared + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +wasm-streams 0.2.3 - MIT OR Apache-2.0 +https://github.com/MattiasBuelens/wasm-streams/ + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +web-sys 0.3.60 - MIT/Apache-2.0 +https://github.com/rustwasm/wasm-bindgen/tree/master/crates/web-sys + +Copyright (c) 2014 Alex Crichton + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +wepoll-ffi 0.1.2 - MIT OR Apache-2.0 OR BSD-2-Clause +https://github.com/aclysma/wepoll-ffi + +MIT License + +Copyright (c) 2019-2020 Philip Degarmo and other wepoll-ffi contributors + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +winapi 0.3.9 - MIT/Apache-2.0 +https://github.com/retep998/winapi-rs + +Copyright (c) 2015-2018 The winapi-rs Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +winapi-i686-pc-windows-gnu 0.4.0 - MIT/Apache-2.0 +https://github.com/retep998/winapi-rs + +Copyright (c) 2015-2018 The winapi-rs Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +winapi-util 0.1.5 - Unlicense/MIT +https://github.com/BurntSushi/winapi-util + +The MIT License (MIT) + +Copyright (c) 2017 Andrew Gallant + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +winapi-x86_64-pc-windows-gnu 0.4.0 - MIT/Apache-2.0 +https://github.com/retep998/winapi-rs + +Copyright (c) 2015-2018 The winapi-rs Developers + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +windows-sys 0.36.1 - MIT OR Apache-2.0 +windows-sys 0.45.0 - MIT OR Apache-2.0 +windows-sys 0.48.0 - MIT OR Apache-2.0 +https://github.com/microsoft/windows-rs + +MIT License + + Copyright (c) Microsoft Corporation. + + 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 +--------------------------------------------------------- + +--------------------------------------------------------- + +windows-targets 0.42.2 - MIT OR Apache-2.0 +windows-targets 0.48.0 - MIT OR Apache-2.0 +https://github.com/microsoft/windows-rs + +MIT License + + Copyright (c) Microsoft Corporation. + + 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 +--------------------------------------------------------- + +--------------------------------------------------------- + +windows_aarch64_gnullvm 0.42.2 - MIT OR Apache-2.0 +windows_aarch64_gnullvm 0.48.0 - MIT OR Apache-2.0 +https://github.com/microsoft/windows-rs + +MIT License + + Copyright (c) Microsoft Corporation. + + 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 +--------------------------------------------------------- + +--------------------------------------------------------- + +windows_aarch64_msvc 0.36.1 - MIT OR Apache-2.0 +windows_aarch64_msvc 0.42.2 - MIT OR Apache-2.0 +windows_aarch64_msvc 0.48.0 - MIT OR Apache-2.0 +https://github.com/microsoft/windows-rs + +MIT License + + Copyright (c) Microsoft Corporation. + + 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 +--------------------------------------------------------- + +--------------------------------------------------------- + +windows_i686_gnu 0.36.1 - MIT OR Apache-2.0 +windows_i686_gnu 0.42.2 - MIT OR Apache-2.0 +windows_i686_gnu 0.48.0 - MIT OR Apache-2.0 +https://github.com/microsoft/windows-rs + +MIT License + + Copyright (c) Microsoft Corporation. + + 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 +--------------------------------------------------------- + +--------------------------------------------------------- + +windows_i686_msvc 0.36.1 - MIT OR Apache-2.0 +windows_i686_msvc 0.42.2 - MIT OR Apache-2.0 +windows_i686_msvc 0.48.0 - MIT OR Apache-2.0 +https://github.com/microsoft/windows-rs + +MIT License + + Copyright (c) Microsoft Corporation. + + 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 +--------------------------------------------------------- + +--------------------------------------------------------- + +windows_x86_64_gnu 0.36.1 - MIT OR Apache-2.0 +windows_x86_64_gnu 0.42.2 - MIT OR Apache-2.0 +windows_x86_64_gnu 0.48.0 - MIT OR Apache-2.0 +https://github.com/microsoft/windows-rs + +MIT License + + Copyright (c) Microsoft Corporation. + + 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 +--------------------------------------------------------- + +--------------------------------------------------------- + +windows_x86_64_gnullvm 0.42.2 - MIT OR Apache-2.0 +windows_x86_64_gnullvm 0.48.0 - MIT OR Apache-2.0 +https://github.com/microsoft/windows-rs + +MIT License + + Copyright (c) Microsoft Corporation. + + 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 +--------------------------------------------------------- + +--------------------------------------------------------- + +windows_x86_64_msvc 0.36.1 - MIT OR Apache-2.0 +windows_x86_64_msvc 0.42.2 - MIT OR Apache-2.0 +windows_x86_64_msvc 0.48.0 - MIT OR Apache-2.0 +https://github.com/microsoft/windows-rs + +MIT License + + Copyright (c) Microsoft Corporation. + + 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 +--------------------------------------------------------- + +--------------------------------------------------------- + +winnow 0.4.1 - MIT +https://github.com/winnow-rs/winnow + +The MIT License (MIT) + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +winreg 0.10.1 - MIT +winreg 0.50.0 - MIT +https://github.com/gentoo90/winreg-rs + +The MIT License (MIT) + +Copyright (c) 2015 Igor Shaula + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +xattr 0.2.3 - MIT/Apache-2.0 +https://github.com/Stebalien/xattr + +Copyright (c) 2015 Steven Allen + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +xdg-home 1.0.0 - MIT +https://github.com/zeenix/xdg-home + +The MIT License (MIT) + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +yasna 0.5.2 - MIT OR Apache-2.0 +https://github.com/qnighy/yasna.rs + +Copyright (c) 2016 Masaki Hara + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +zbus 3.13.1 - MIT +https://github.com/dbus2/zbus/ + +The MIT License (MIT) + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +zbus_macros 3.13.1 - MIT +https://github.com/dbus2/zbus/ + +The MIT License (MIT) + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +zbus_names 2.5.1 - MIT +https://github.com/dbus2/zbus/ + +The MIT License (MIT) + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +zeroize 1.3.0 - Apache-2.0 OR MIT +https://github.com/RustCrypto/utils/tree/master/zeroize + +All crates licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260052-utils +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg +[deps-link]: https://deps.rs/repo/github/RustCrypto/utils + +[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg +[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg +[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg +[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg +[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg +[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg +[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg +[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg +[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg + +[//]: # (crates) + +[`blobby`]: ./blobby +[`block-buffer`]: ./block-buffer +[`blockā€‘padding`]: ./block-padding +[`cmov`]: ./cmov +[`collectable`]: ./collectable +[`cpufeatures`]: ./cpufeatures +[`dbl`]: ./dbl +[`hex-literal`]: ./hex-literal +[`inout`]: ./inout +[`opaque-debug`]: ./opaque-debug +[`wycheproof2blb`]: ./wycheproof2blb +[`zeroize`]: ./zeroize + +[//]: # (misc) + +[Wycheproof]: https://github.com/google/wycheproof +--------------------------------------------------------- + +--------------------------------------------------------- + +zip 0.6.6 - MIT +https://github.com/zip-rs/zip + +The MIT License (MIT) + +Copyright (c) 2014 Mathijs van de Nes + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +zvariant 3.14.0 - MIT +https://github.com/dbus2/zbus/ + +The MIT License (MIT) + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +zvariant_derive 3.14.0 - MIT +https://github.com/dbus2/zbus/ + +The MIT License (MIT) + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + +zvariant_utils 1.0.1 - MIT +https://github.com/dbus2/zbus/ + +The MIT License (MIT) + +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. +--------------------------------------------------------- \ No newline at end of file diff --git a/cli/build.rs b/cli/build.rs index 03247a94470..41e289774e9 100644 --- a/cli/build.rs +++ b/cli/build.rs @@ -20,12 +20,12 @@ fn main() { fn apply_build_environment_variables() { // only do this for local, debug builds - if env::var("PROFILE").unwrap() != "debug" { + if env::var("PROFILE").unwrap() != "debug" || env::var("VSCODE_CLI_ALREADY_PREPARED").is_ok() { return; } let pkg_dir = env::var("CARGO_MANIFEST_DIR").unwrap(); - let mut cmd = Command::new("node"); + let mut cmd = Command::new(env::var("NODE_PATH").unwrap_or_else(|_| "node".to_string())); cmd.arg("../build/azure-pipelines/cli/prepare.js"); cmd.current_dir(&pkg_dir); cmd.env("VSCODE_CLI_PREPARE_OUTPUT", "json"); diff --git a/cli/src/async_pipe.rs b/cli/src/async_pipe.rs index dcbe0d16017..6c7c918967a 100644 --- a/cli/src/async_pipe.rs +++ b/cli/src/async_pipe.rs @@ -4,7 +4,10 @@ *--------------------------------------------------------------------------------------------*/ use crate::{constants::APPLICATION_NAME, util::errors::CodeError}; +use async_trait::async_trait; use std::path::{Path, PathBuf}; +use tokio::io::{AsyncRead, AsyncWrite}; +use tokio::net::TcpListener; use uuid::Uuid; // todo: we could probably abstract this into some crate, if one doesn't already exist @@ -39,7 +42,7 @@ cfg_if::cfg_if! { pipe.into_split() } } else { - use tokio::{time::sleep, io::{AsyncRead, AsyncWrite, ReadBuf}}; + use tokio::{time::sleep, io::ReadBuf}; use tokio::net::windows::named_pipe::{ClientOptions, ServerOptions, NamedPipeClient, NamedPipeServer}; use std::{time::Duration, pin::Pin, task::{Context, Poll}, io}; use pin_project::pin_project; @@ -181,3 +184,34 @@ pub fn get_socket_name() -> PathBuf { } } } + +pub type AcceptedRW = ( + Box, + Box, +); + +#[async_trait] +pub trait AsyncRWAccepter { + async fn accept_rw(&mut self) -> Result; +} + +#[async_trait] +impl AsyncRWAccepter for AsyncPipeListener { + async fn accept_rw(&mut self) -> Result { + let pipe = self.accept().await?; + let (read, write) = socket_stream_split(pipe); + Ok((Box::new(read), Box::new(write))) + } +} + +#[async_trait] +impl AsyncRWAccepter for TcpListener { + async fn accept_rw(&mut self) -> Result { + let (stream, _) = self + .accept() + .await + .map_err(CodeError::AsyncPipeListenerFailed)?; + let (read, write) = tokio::io::split(stream); + Ok((Box::new(read), Box::new(write))) + } +} diff --git a/cli/src/auth.rs b/cli/src/auth.rs index a27850b6242..42bd3a894dc 100644 --- a/cli/src/auth.rs +++ b/cli/src/auth.rs @@ -10,7 +10,8 @@ use crate::{ trace, util::{ errors::{ - wrap, AnyError, OAuthError, RefreshTokenNotAvailableError, StatusError, WrappedError, + wrap, AnyError, CodeError, OAuthError, RefreshTokenNotAvailableError, StatusError, + WrappedError, }, input::prompt_options, }, @@ -20,7 +21,7 @@ use async_trait::async_trait; use chrono::{DateTime, Duration, Utc}; use gethostname::gethostname; use serde::{de::DeserializeOwned, Deserialize, Serialize}; -use std::{cell::Cell, fmt::Display, path::PathBuf, sync::Arc}; +use std::{cell::Cell, fmt::Display, path::PathBuf, sync::Arc, thread}; use tokio::time::sleep; use tunnels::{ contracts::PROD_FIRST_PARTY_APP_ID, @@ -49,7 +50,7 @@ struct AuthenticationError { error_description: Option, } -#[derive(clap::ArgEnum, Serialize, Deserialize, Debug, Clone, Copy)] +#[derive(clap::ValueEnum, Serialize, Deserialize, Debug, Clone, Copy)] pub enum AuthProvider { Microsoft, Github, @@ -160,6 +161,7 @@ impl StoredCredential { struct StorageWithLastRead { storage: Box, + fallback_storage: Option, last_read: Cell, WrappedError>>, } @@ -172,9 +174,9 @@ pub struct Auth { } trait StorageImplementation: Send + Sync { - fn read(&mut self) -> Result, WrappedError>; - fn store(&mut self, value: StoredCredential) -> Result<(), WrappedError>; - fn clear(&mut self) -> Result<(), WrappedError>; + fn read(&mut self) -> Result, AnyError>; + fn store(&mut self, value: StoredCredential) -> Result<(), AnyError>; + fn clear(&mut self) -> Result<(), AnyError>; } // unseal decrypts and deserializes the value @@ -210,6 +212,66 @@ const KEYCHAIN_ENTRY_LIMIT: usize = 128 * 1024; const CONTINUE_MARKER: &str = ""; +/// Implementation that wraps the KeyringStorage on Linux to avoid +/// https://github.com/hwchen/keyring-rs/issues/132 +struct ThreadKeyringStorage { + s: Option, +} + +impl ThreadKeyringStorage { + fn thread_op(&mut self, f: Fn) -> Result + where + Fn: 'static + Send + FnOnce(&mut KeyringStorage) -> Result, + R: 'static + Send, + { + let mut s = match self.s.take() { + Some(s) => s, + None => return Err(CodeError::KeyringTimeout.into()), + }; + + // It seems like on Linux communication to the keyring can block indefinitely. + // Fall back after a 5 second timeout. + let (sender, receiver) = std::sync::mpsc::channel(); + let tsender = sender.clone(); + + thread::spawn(move || sender.send(Some((f(&mut s), s)))); + thread::spawn(move || { + thread::sleep(std::time::Duration::from_secs(5)); + let _ = tsender.send(None); + }); + + match receiver.recv().unwrap() { + Some((r, s)) => { + self.s = Some(s); + r + } + None => Err(CodeError::KeyringTimeout.into()), + } + } +} + +impl Default for ThreadKeyringStorage { + fn default() -> Self { + Self { + s: Some(KeyringStorage::default()), + } + } +} + +impl StorageImplementation for ThreadKeyringStorage { + fn read(&mut self) -> Result, AnyError> { + self.thread_op(|s| s.read()) + } + + fn store(&mut self, value: StoredCredential) -> Result<(), AnyError> { + self.thread_op(move |s| s.store(value)) + } + + fn clear(&mut self) -> Result<(), AnyError> { + self.thread_op(|s| s.clear()) + } +} + #[derive(Default)] struct KeyringStorage { // keywring storage can be split into multiple entries due to entry length limits @@ -222,7 +284,7 @@ macro_rules! get_next_entry { match $self.entries.get($i) { Some(e) => e, None => { - let e = keyring::Entry::new("vscode-cli", &format!("vscode-cli-{}", $i)); + let e = keyring::Entry::new("vscode-cli", &format!("vscode-cli-{}", $i)).unwrap(); $self.entries.push(e); $self.entries.last().unwrap() } @@ -231,7 +293,7 @@ macro_rules! get_next_entry { } impl StorageImplementation for KeyringStorage { - fn read(&mut self) -> Result, WrappedError> { + fn read(&mut self) -> Result, AnyError> { let mut str = String::new(); for i in 0.. { @@ -239,7 +301,7 @@ impl StorageImplementation for KeyringStorage { let next_chunk = match entry.get_password() { Ok(value) => value, Err(keyring::Error::NoEntry) => return Ok(None), // missing entries? - Err(e) => return Err(wrap(e, "error reading keyring")), + Err(e) => return Err(wrap(e, "error reading keyring").into()), }; if next_chunk.ends_with(CONTINUE_MARKER) { @@ -253,7 +315,7 @@ impl StorageImplementation for KeyringStorage { Ok(unseal(&str)) } - fn store(&mut self, value: StoredCredential) -> Result<(), WrappedError> { + fn store(&mut self, value: StoredCredential) -> Result<(), AnyError> { let sealed = seal(&value); let step_size = KEYCHAIN_ENTRY_LIMIT - CONTINUE_MARKER.len(); @@ -270,14 +332,14 @@ impl StorageImplementation for KeyringStorage { }; if let Err(e) = stored { - return Err(wrap(e, "error updating keyring")); + return Err(wrap(e, "error updating keyring").into()); } } Ok(()) } - fn clear(&mut self) -> Result<(), WrappedError> { + fn clear(&mut self) -> Result<(), AnyError> { self.read().ok(); // make sure component parts are available for entry in self.entries.iter() { entry @@ -293,16 +355,16 @@ impl StorageImplementation for KeyringStorage { struct FileStorage(PersistedState>); impl StorageImplementation for FileStorage { - fn read(&mut self) -> Result, WrappedError> { + fn read(&mut self) -> Result, AnyError> { Ok(self.0.load().and_then(|s| unseal(&s))) } - fn store(&mut self, value: StoredCredential) -> Result<(), WrappedError> { - self.0.save(Some(seal(&value))) + fn store(&mut self, value: StoredCredential) -> Result<(), AnyError> { + self.0.save(Some(seal(&value))).map_err(|e| e.into()) } - fn clear(&mut self) -> Result<(), WrappedError> { - self.0.save(None) + fn clear(&mut self) -> Result<(), AnyError> { + self.0.save(None).map_err(|e| e.into()) } } @@ -325,23 +387,38 @@ impl Auth { return op(s); } + #[cfg(not(target_os = "linux"))] let mut keyring_storage = KeyringStorage::default(); + #[cfg(target_os = "linux")] + let mut keyring_storage = ThreadKeyringStorage::default(); let mut file_storage = FileStorage(PersistedState::new(self.file_storage_path.clone())); - let keyring_storage_result = match std::env::var("VSCODE_CLI_USE_FILE_KEYCHAIN") { - Ok(_) => Err(wrap("", "user prefers file storage")), - _ => keyring_storage.read(), + let native_storage_result = if std::env::var("VSCODE_CLI_USE_FILE_KEYCHAIN").is_ok() + || self.file_storage_path.exists() + { + Err(wrap("", "user prefers file storage").into()) + } else { + keyring_storage.read() }; - let mut storage = match keyring_storage_result { + let mut storage = match native_storage_result { Ok(v) => StorageWithLastRead { last_read: Cell::new(Ok(v)), + fallback_storage: Some(file_storage), storage: Box::new(keyring_storage), }, - Err(_) => StorageWithLastRead { - last_read: Cell::new(file_storage.read()), - storage: Box::new(file_storage), - }, + Err(e) => { + debug!(self.log, "Using file keychain storage due to: {}", e); + StorageWithLastRead { + last_read: Cell::new( + file_storage + .read() + .map_err(|e| wrap(e, "could not read from file storage")), + ), + fallback_storage: None, + storage: Box::new(file_storage), + } + } }; let out = op(&mut storage); @@ -374,7 +451,7 @@ impl Auth { } /// Clears login info from the keyring. - pub fn clear_credentials(&self) -> Result<(), WrappedError> { + pub fn clear_credentials(&self) -> Result<(), AnyError> { self.with_storage(|storage| { storage.storage.clear()?; storage.last_read.set(Ok(None)); @@ -460,7 +537,18 @@ impl Auth { "Failed to update keyring with new credentials: {}", e ); + + if let Some(fb) = storage.fallback_storage.take() { + storage.storage = Box::new(fb); + match storage.storage.store(creds.clone()) { + Err(e) => { + warning!(self.log, "Also failed to update fallback storage: {}", e) + } + Ok(_) => debug!(self.log, "Updated fallback storage successfully"), + } + } } + storage.last_read.set(Ok(Some(creds))); }) } diff --git a/cli/src/bin/code/legacy_args.rs b/cli/src/bin/code/legacy_args.rs index 361348d8373..808b4aa30a8 100644 --- a/cli/src/bin/code/legacy_args.rs +++ b/cli/src/bin/code/legacy_args.rs @@ -29,12 +29,12 @@ pub fn try_parse_legacy( match args.get_mut(long) { Some(prev) => { if let Some(v) = value { - prev.push(v.to_str_lossy().to_string()); + prev.push(v.to_string_lossy().to_string()); } } None => { if let Some(v) = value { - args.insert(long.to_string(), vec![v.to_str_lossy().to_string()]); + args.insert(long.to_string(), vec![v.to_string_lossy().to_string()]); } else { args.insert(long.to_string(), vec![]); } diff --git a/cli/src/bin/code/main.rs b/cli/src/bin/code/main.rs index 54660c935f6..8c32ee14d89 100644 --- a/cli/src/bin/code/main.rs +++ b/cli/src/bin/code/main.rs @@ -8,7 +8,7 @@ use std::process::Command; use clap::Parser; use cli::{ - commands::{args, internal_wsl, tunnels, update, version, CommandContext}, + commands::{args, tunnels, update, version, CommandContext}, constants::get_default_user_agent, desktop, log, state::LauncherPaths, @@ -65,9 +65,6 @@ async fn main() -> Result<(), std::convert::Infallible> { .. }) => match cmd { args::StandaloneCommands::Update(args) => update::update(context!(), args).await, - args::StandaloneCommands::Wsl(args) => match args.command { - args::WslCommands::Serve => internal_wsl::serve(context!()).await, - }, }, args::AnyCli::Standalone(args::StandaloneCli { core: c, .. }) | args::AnyCli::Integrated(args::IntegratedCli { core: c, .. }) => match c.subcommand { @@ -98,6 +95,10 @@ async fn main() -> Result<(), std::convert::Infallible> { args::VersionSubcommand::Show => version::show(context!()).await, }, + Some(args::Commands::CommandShell(cs_args)) => { + tunnels::command_shell(context!(), cs_args).await + } + Some(args::Commands::Tunnel(tunnel_args)) => match tunnel_args.subcommand { Some(args::TunnelSubcommand::Prune) => tunnels::prune(context!()).await, Some(args::TunnelSubcommand::Unregister) => tunnels::unregister(context!()).await, @@ -113,6 +114,9 @@ async fn main() -> Result<(), std::convert::Infallible> { Some(args::TunnelSubcommand::Service(service_args)) => { tunnels::service(context_no_logger(), service_args).await } + Some(args::TunnelSubcommand::ForwardInternal(forward_args)) => { + tunnels::forward(context_no_logger(), forward_args).await + } None => tunnels::serve(context_no_logger(), tunnel_args.serve_args).await, }, }, @@ -134,7 +138,8 @@ fn make_logger(core: &args::CliCore) -> log::Logger { let tracer = SdkTracerProvider::builder().build().tracer("codecli"); let mut log = log::Logger::new(tracer, log_level); if let Some(f) = &core.global_options.log_to_file { - log = log.tee(log::FileLogSink::new(log_level, f).expect("expected to make file logger")) + log = log + .with_sink(log::FileLogSink::new(log_level, f).expect("expected to make file logger")) } log diff --git a/cli/src/commands.rs b/cli/src/commands.rs index 082031af201..754729f2c04 100644 --- a/cli/src/commands.rs +++ b/cli/src/commands.rs @@ -6,7 +6,6 @@ mod context; pub mod args; -pub mod internal_wsl; pub mod tunnels; pub mod update; pub mod version; diff --git a/cli/src/commands/args.rs b/cli/src/commands/args.rs index 8687819f893..0051f72f395 100644 --- a/cli/src/commands/args.rs +++ b/cli/src/commands/args.rs @@ -6,7 +6,7 @@ use std::{fmt, path::PathBuf}; use crate::{constants, log, options, tunnels::code_server::CodeServerArgs}; -use clap::{ArgEnum, Args, Parser, Subcommand}; +use clap::{Args, Parser, Subcommand, ValueEnum}; use const_format::concatcp; const CLI_NAME: &str = concatcp!(constants::PRODUCT_NAME_LONG, " CLI"); @@ -146,22 +146,6 @@ impl<'a> From<&'a CliCore> for CodeServerArgs { pub enum StandaloneCommands { /// Updates the CLI. Update(StandaloneUpdateArgs), - - /// Internal commands for WSL serving. - #[clap(hide = true)] - Wsl(WslArgs), -} - -#[derive(Args, Debug, Clone)] -pub struct WslArgs { - #[clap(subcommand)] - pub command: WslCommands, -} - -#[derive(Subcommand, Debug, Clone)] -pub enum WslCommands { - /// Runs the WSL server on stdin/out - Serve, } #[derive(Args, Debug, Clone)] @@ -187,6 +171,23 @@ pub enum Commands { /// Changes the version of the editor you're using. Version(VersionArgs), + + /// Runs the control server on process stdin/stdout + #[clap(hide = true)] + CommandShell(CommandShellArgs), +} + +#[derive(Args, Debug, Clone)] +pub struct CommandShellArgs { + /// Listen on a socket instead of stdin/stdout. + #[clap(long)] + pub on_socket: bool, + /// Listen on a port instead of stdin/stdout. + #[clap(long)] + pub on_port: bool, + /// Require the given token string to be given in the handshake. + #[clap(long)] + pub require_token: Option, } #[derive(Args, Debug, Clone)] @@ -411,7 +412,7 @@ pub struct DesktopCodeOptions { #[derive(Args, Debug, Clone)] pub struct OutputFormatOptions { /// Set the data output formats. - #[clap(arg_enum, long, value_name = "format", default_value_t = OutputFormat::Text)] + #[clap(value_enum, long, value_name = "format", default_value_t = OutputFormat::Text)] pub format: OutputFormat, } @@ -441,7 +442,7 @@ pub struct GlobalOptions { pub log_to_file: Option, /// Log level to use. - #[clap(long, arg_enum, value_name = "level", global = true)] + #[clap(long, value_enum, value_name = "level", global = true)] pub log: Option, /// Disable telemetry for the current command, even if it was previously @@ -450,7 +451,7 @@ pub struct GlobalOptions { pub disable_telemetry: bool, /// Sets the initial telemetry level - #[clap(arg_enum, long, global = true, hide = true)] + #[clap(value_enum, long, global = true, hide = true)] pub telemetry_level: Option, } @@ -486,7 +487,7 @@ pub struct EditorTroubleshooting { pub disable_extension: Vec, /// Turn sync on or off. - #[clap(arg_enum, long, value_name = "on | off")] + #[clap(value_enum, long, value_name = "on | off")] pub sync: Option, /// Allow debugging and profiling of extensions. Check the developer tools for the connection URI. @@ -536,7 +537,7 @@ impl EditorTroubleshooting { } } -#[derive(ArgEnum, Clone, Copy, Debug)] +#[derive(ValueEnum, Clone, Copy, Debug)] pub enum SyncState { On, Off, @@ -551,7 +552,7 @@ impl fmt::Display for SyncState { } } -#[derive(ArgEnum, Clone, Copy, Debug)] +#[derive(ValueEnum, Clone, Copy, Debug)] pub enum OutputFormat { Json, Text, @@ -560,6 +561,7 @@ pub enum OutputFormat { #[derive(Args, Clone, Debug, Default)] pub struct ExistingTunnelArgs { /// Name you'd like to assign preexisting tunnel to use to connect the tunnel + /// Old option, new code sohuld just use `--name`. #[clap(long, hide = true)] pub tunnel_name: Option, @@ -623,7 +625,7 @@ pub enum TunnelSubcommand { /// Restarts any running tunnel on the system. Restart, - /// Gets whether there is a tunnel running on the current machineiou. + /// Gets whether there is a tunnel running on the current machine. Status, /// Rename the name of this machine associated with port forwarding service. @@ -638,6 +640,10 @@ pub enum TunnelSubcommand { /// (Preview) Manages the tunnel when installed as a system service, #[clap(subcommand)] Service(TunnelServiceSubCommands), + + /// (Preview) Forwards local port using the dev tunnel + #[clap(hide = true)] + ForwardInternal(TunnelForwardArgs), } #[derive(Subcommand, Debug, Clone)] @@ -661,6 +667,10 @@ pub struct TunnelServiceInstallArgs { /// If set, the user accepts the server license terms and the server will be started without a user prompt. #[clap(long)] pub accept_server_license_terms: bool, + + /// Sets the machine name for port forwarding service + #[clap(long)] + pub name: Option, } #[derive(Args, Debug, Clone)] @@ -669,6 +679,16 @@ pub struct TunnelRenameArgs { pub name: String, } +#[derive(Args, Debug, Clone)] +pub struct TunnelForwardArgs { + /// One or more ports to forward. + pub ports: Vec, + + /// Login args -- used for convenience so the forwarding call is a single action. + #[clap(flatten)] + pub login: LoginArgs, +} + #[derive(Subcommand, Debug, Clone)] pub enum TunnelUserSubCommands { /// Log in to port forwarding service @@ -689,11 +709,11 @@ pub struct LoginArgs { pub access_token: Option, /// The auth provider to use. If not provided, a prompt will be shown. - #[clap(arg_enum, long)] + #[clap(value_enum, long)] pub provider: Option, } -#[derive(clap::ArgEnum, Debug, Clone, Copy)] +#[derive(clap::ValueEnum, Debug, Clone, Copy)] pub enum AuthProvider { Microsoft, Github, diff --git a/cli/src/commands/internal_wsl.rs b/cli/src/commands/internal_wsl.rs deleted file mode 100644 index 483ee52c6aa..00000000000 --- a/cli/src/commands/internal_wsl.rs +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -use crate::{ - tunnels::{serve_wsl, shutdown_signal::ShutdownRequest}, - util::{errors::AnyError, prereqs::PreReqChecker}, -}; - -use super::CommandContext; - -pub async fn serve(ctx: CommandContext) -> Result { - let signal = ShutdownRequest::create_rx([ShutdownRequest::CtrlC]); - let platform = spanf!( - ctx.log, - ctx.log.span("prereq"), - PreReqChecker::new().verify() - )?; - - serve_wsl( - ctx.log, - ctx.paths, - (&ctx.args).into(), - platform, - ctx.http, - signal, - ) - .await?; - - Ok(0) -} diff --git a/cli/src/commands/tunnels.rs b/cli/src/commands/tunnels.rs index 56db02c58ed..85bfecc50a5 100644 --- a/cli/src/commands/tunnels.rs +++ b/cli/src/commands/tunnels.rs @@ -4,38 +4,50 @@ *--------------------------------------------------------------------------------------------*/ use async_trait::async_trait; +use base64::{engine::general_purpose as b64, Engine as _}; +use futures::{stream::FuturesUnordered, StreamExt}; +use serde::Serialize; use sha2::{Digest, Sha256}; use std::{str::FromStr, time::Duration}; use sysinfo::Pid; +use tokio::{ + io::{AsyncBufReadExt, BufReader}, + sync::watch, +}; use super::{ args::{ - AuthProvider, CliCore, ExistingTunnelArgs, TunnelRenameArgs, TunnelServeArgs, - TunnelServiceSubCommands, TunnelUserSubCommands, + AuthProvider, CliCore, CommandShellArgs, ExistingTunnelArgs, TunnelForwardArgs, + TunnelRenameArgs, TunnelServeArgs, TunnelServiceSubCommands, TunnelUserSubCommands, }, CommandContext, }; use crate::{ + async_pipe::{get_socket_name, listen_socket_rw_stream, AsyncRWAccepter}, auth::Auth, - constants::{APPLICATION_NAME, TUNNEL_CLI_LOCK_NAME, TUNNEL_SERVICE_LOCK_NAME}, + constants::{ + APPLICATION_NAME, CONTROL_PORT, IS_A_TTY, TUNNEL_CLI_LOCK_NAME, TUNNEL_SERVICE_LOCK_NAME, + }, log, state::LauncherPaths, tunnels::{ code_server::CodeServerArgs, - create_service_manager, dev_tunnels, legal, + create_service_manager, + dev_tunnels::{self, DevTunnels}, + forwarding, legal, paths::get_all_servers, - protocol, + protocol, serve_stream, shutdown_signal::ShutdownRequest, singleton_client::do_single_rpc_call, singleton_server::{ make_singleton_server, start_singleton_server, BroadcastLogSink, SingletonServerArgs, }, - Next, ServiceContainer, ServiceManager, + AuthRequired, Next, ServeStreamParams, ServiceContainer, ServiceManager, }, util::{ app_lock::AppMutex, - errors::{wrap, AnyError}, + errors::{wrap, AnyError, CodeError}, prereqs::PreReqChecker, }, }; @@ -57,20 +69,31 @@ impl From for crate::auth::AuthProvider { } } -impl From for Option { - fn from(d: ExistingTunnelArgs) -> Option { - if let (Some(tunnel_id), Some(tunnel_name), Some(cluster), Some(host_token)) = - (d.tunnel_id, d.tunnel_name, d.cluster, d.host_token) - { +fn fulfill_existing_tunnel_args( + d: ExistingTunnelArgs, + name_arg: &Option, +) -> Option { + let tunnel_name = d.tunnel_name.or_else(|| name_arg.clone()); + + match (d.tunnel_id, d.cluster, d.host_token) { + (Some(tunnel_id), None, Some(host_token)) => { + let i = tunnel_id.find('.')?; Some(dev_tunnels::ExistingTunnel { - tunnel_id, + tunnel_id: tunnel_id[..i].to_string(), + cluster: tunnel_id[i + 1..].to_string(), tunnel_name, host_token, - cluster, }) - } else { - None } + + (Some(tunnel_id), Some(cluster), Some(host_token)) => Some(dev_tunnels::ExistingTunnel { + tunnel_id, + tunnel_name, + host_token, + cluster, + }), + + _ => None, } } @@ -107,6 +130,73 @@ impl ServiceContainer for TunnelServiceContainer { } } +pub async fn command_shell(ctx: CommandContext, args: CommandShellArgs) -> Result { + let platform = PreReqChecker::new().verify().await?; + let mut params = ServeStreamParams { + log: ctx.log, + launcher_paths: ctx.paths, + platform, + requires_auth: args + .require_token + .map(AuthRequired::VSDAWithToken) + .unwrap_or(AuthRequired::VSDA), + exit_barrier: ShutdownRequest::create_rx([ShutdownRequest::CtrlC]), + code_server_args: (&ctx.args).into(), + }; + + let mut listener: Box = match (args.on_port, args.on_socket) { + (_, true) => { + let socket = get_socket_name(); + let listener = listen_socket_rw_stream(&socket) + .await + .map_err(|e| wrap(e, "error listening on socket"))?; + + params + .log + .result(format!("Listening on {}", socket.display())); + + Box::new(listener) + } + (true, _) => { + let listener = tokio::net::TcpListener::bind("127.0.0.1:0") + .await + .map_err(|e| wrap(e, "error listening on port"))?; + + params + .log + .result(format!("Listening on {}", listener.local_addr().unwrap())); + + Box::new(listener) + } + _ => { + serve_stream(tokio::io::stdin(), tokio::io::stderr(), params).await; + return Ok(0); + } + }; + + let mut servers = FuturesUnordered::new(); + + loop { + tokio::select! { + Some(_) = servers.next() => {}, + socket = listener.accept_rw() => { + match socket { + Ok((read, write)) => servers.push(serve_stream(read, write, params.clone())), + Err(e) => { + error!(params.log, &format!("Error accepting connection: {}", e)); + return Ok(1); + } + } + }, + _ = params.exit_barrier.wait() => { + // wait for all servers to finish up: + while (servers.next().await).is_some() { } + return Ok(0); + } + } + } +} + pub async fn service( ctx: CommandContext, service_args: TunnelServiceSubCommands, @@ -114,10 +204,17 @@ pub async fn service( let manager = create_service_manager(ctx.log.clone(), &ctx.paths); match service_args { TunnelServiceSubCommands::Install(args) => { - // ensure logged in, otherwise subsequent serving will fail - Auth::new(&ctx.paths, ctx.log.clone()) - .get_credential() - .await?; + let auth = Auth::new(&ctx.paths, ctx.log.clone()); + + if let Some(name) = &args.name { + // ensure the name matches, and tunnel exists + dev_tunnels::DevTunnels::new_remote_tunnel(&ctx.log, auth, &ctx.paths) + .rename_tunnel(name) + .await?; + } else { + // still ensure they're logged in, otherwise subsequent serving will fail + auth.get_credential().await?; + } // likewise for license consent legal::require_consent(&ctx.paths, args.accept_server_license_terms)?; @@ -182,23 +279,23 @@ pub async fn user(ctx: CommandContext, user_args: TunnelUserSubCommands) -> Resu Ok(0) } -/// Remove the tunnel used by this gateway, if any. +/// Remove the tunnel used by this tunnel, if any. pub async fn rename(ctx: CommandContext, rename_args: TunnelRenameArgs) -> Result { let auth = Auth::new(&ctx.paths, ctx.log.clone()); - let mut dt = dev_tunnels::DevTunnels::new(&ctx.log, auth, &ctx.paths); + let mut dt = dev_tunnels::DevTunnels::new_remote_tunnel(&ctx.log, auth, &ctx.paths); dt.rename_tunnel(&rename_args.name).await?; ctx.log.result(format!( - "Successfully renamed this gateway to {}", + "Successfully renamed this tunnel to {}", &rename_args.name )); Ok(0) } -/// Remove the tunnel used by this gateway, if any. +/// Remove the tunnel used by this tunnel, if any. pub async fn unregister(ctx: CommandContext) -> Result { let auth = Auth::new(&ctx.paths, ctx.log.clone()); - let mut dt = dev_tunnels::DevTunnels::new(&ctx.log, auth, &ctx.paths); + let mut dt = dev_tunnels::DevTunnels::new_remote_tunnel(&ctx.log, auth, &ctx.paths); dt.remove_tunnel().await?; Ok(0) } @@ -227,16 +324,37 @@ pub async fn kill(ctx: CommandContext) -> Result { .map_err(|e| e.into()) } +#[derive(Serialize)] +pub struct StatusOutput { + pub tunnel: Option, + pub service_installed: bool, +} + pub async fn status(ctx: CommandContext) -> Result { - let status: protocol::singleton::Status = do_single_rpc_call( + let tunnel_status = do_single_rpc_call::<_, protocol::singleton::Status>( &ctx.paths.tunnel_lockfile(), ctx.log.clone(), protocol::singleton::METHOD_STATUS, protocol::EmptyObject {}, ) - .await?; + .await; - ctx.log.result(serde_json::to_string(&status).unwrap()); + let service_installed = create_service_manager(ctx.log.clone(), &ctx.paths) + .is_installed() + .await + .unwrap_or(false); + + ctx.log.result( + serde_json::to_string(&StatusOutput { + service_installed, + tunnel: match tunnel_status { + Ok(s) => Some(s.tunnel), + Err(CodeError::NoRunningTunnel) => None, + Err(e) => return Err(e.into()), + }, + }) + .unwrap(), + ); Ok(0) } @@ -285,11 +403,90 @@ pub async fn serve(ctx: CommandContext, gateway_args: TunnelServeArgs) -> Result result } +/// Internal command used by port forwarding. It reads requests for forwarded ports +/// on lines from stdin, as JSON. It uses singleton logic as well (though on +/// a different tunnel than the main one used for the control server) so that +/// all forward requests on a single machine go through a single hosted tunnel +/// process. Without singleton logic, requests could get routed to processes +/// that aren't forwarding a given port and then fail. +pub async fn forward( + ctx: CommandContext, + mut forward_args: TunnelForwardArgs, +) -> Result { + // Spooky: check IS_A_TTY before starting the stdin reader, since IS_A_TTY will + // access stdin but a lock will later be held on stdin by the line-reader. + if *IS_A_TTY { + trace!(ctx.log, "port forwarding is an internal preview feature"); + } + + // #region stdin reading logic: + let (own_ports_tx, own_ports_rx) = watch::channel(vec![]); + let ports_process_log = ctx.log.clone(); + tokio::spawn(async move { + let mut lines = BufReader::new(tokio::io::stdin()).lines(); + while let Ok(Some(line)) = lines.next_line().await { + match serde_json::from_str(&line) { + Ok(p) => { + let _ = own_ports_tx.send(p); + } + Err(e) => warning!(ports_process_log, "error parsing ports: {}", e), + } + } + }); + + // #region singleton acquisition + let shutdown = ShutdownRequest::create_rx([ShutdownRequest::CtrlC]); + let server = loop { + if shutdown.is_open() { + return Ok(0); + } + + match acquire_singleton(&ctx.paths.forwarding_lockfile()).await { + Ok(SingletonConnection::Client(stream)) => { + debug!(ctx.log, "starting as client to singleton"); + let r = forwarding::client(forwarding::SingletonClientArgs { + log: ctx.log.clone(), + shutdown: shutdown.clone(), + stream, + port_requests: own_ports_rx.clone(), + }) + .await; + if let Err(e) = r { + warning!(ctx.log, "error contacting forwarding singleton: {}", e); + } + } + Ok(SingletonConnection::Singleton(server)) => break server, + Err(e) => { + warning!(ctx.log, "error access singleton, retrying: {}", e); + tokio::time::sleep(Duration::from_secs(2)).await + } + } + }; + + // #region singleton handler + let auth = Auth::new(&ctx.paths, ctx.log.clone()); + if let (Some(p), Some(at)) = ( + forward_args.login.provider.take(), + forward_args.login.access_token.take(), + ) { + auth.login(Some(p.into()), Some(at)).await?; + } + + let mut tunnels = DevTunnels::new_port_forwarding(&ctx.log, auth, &ctx.paths); + let tunnel = tunnels + .start_new_launcher_tunnel(None, true, &forward_args.ports) + .await?; + + forwarding::server(ctx.log, tunnel, server, own_ports_rx, shutdown).await?; + + Ok(0) +} + fn get_connection_token(tunnel: &ActiveTunnel) -> String { let mut hash = Sha256::new(); hash.update(tunnel.id.as_bytes()); let result = hash.finalize(); - base64::encode_config(result, base64::URL_SAFE_NO_PAD) + b64::URL_SAFE_NO_PAD.encode(result) } async fn serve_with_csa( @@ -303,6 +500,13 @@ async fn serve_with_csa( log = log.tee(log_broadcast.clone()); log::install_global_logger(log.clone()); // re-install so that library logs are captured + debug!( + log, + "Starting tunnel with `{} {}`", + APPLICATION_NAME, + std::env::args().collect::>().join(" ") + ); + // Intentionally read before starting the server. If the server updated and // respawn is requested, the old binary will get renamed, and then // current_exe will point to the wrong path. @@ -325,7 +529,7 @@ async fn serve_with_csa( return Ok(0); } - match acquire_singleton(paths.tunnel_lockfile()).await { + match acquire_singleton(&paths.tunnel_lockfile()).await { Ok(SingletonConnection::Client(stream)) => { debug!(log, "starting as client to singleton"); let should_exit = start_singleton_client(SingletonClientArgs { @@ -354,13 +558,19 @@ async fn serve_with_csa( let _lock = app_mutex_name.map(AppMutex::new); let auth = Auth::new(&paths, log.clone()); - let mut dt = dev_tunnels::DevTunnels::new(&log, auth, &paths); + let mut dt = dev_tunnels::DevTunnels::new_remote_tunnel(&log, auth, &paths); loop { - let tunnel = if let Some(d) = gateway_args.tunnel.clone().into() { - dt.start_existing_tunnel(d).await + let tunnel = if let Some(t) = + fulfill_existing_tunnel_args(gateway_args.tunnel.clone(), &gateway_args.name) + { + dt.start_existing_tunnel(t).await } else { - dt.start_new_launcher_tunnel(gateway_args.name.as_deref(), gateway_args.random_name) - .await + dt.start_new_launcher_tunnel( + gateway_args.name.as_deref(), + gateway_args.random_name, + &[CONTROL_PORT], + ) + .await }?; csa.connection_token = Some(get_connection_token(&tunnel)); @@ -393,7 +603,10 @@ async fn serve_with_csa( return Ok(exit.code().unwrap_or(1)); } - Next::Exit => return Ok(0), + Next::Exit => { + debug!(log, "Tunnel shut down"); + return Ok(0); + } Next::Restart => continue, } } diff --git a/cli/src/constants.rs b/cli/src/constants.rs index fa419e11568..19ae4c82600 100644 --- a/cli/src/constants.rs +++ b/cli/src/constants.rs @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -use std::collections::HashMap; +use std::{collections::HashMap, io::IsTerminal}; use const_format::concatcp; use lazy_static::lazy_static; @@ -18,7 +18,8 @@ pub const CONTROL_PORT: u16 = 31545; /// 2 - Addition of `serve.compressed` property to control whether servermsg's /// are compressed bidirectionally. /// 3 - The server's connection token is set to a SHA256 hash of the tunnel ID -pub const PROTOCOL_VERSION: u32 = 3; +/// 4 - The server's msgpack messages are no longer length-prefixed +pub const PROTOCOL_VERSION: u32 = 4; /// Prefix for the tunnel tag that includes the version. pub const PROTOCOL_VERSION_TAG_PREFIX: &str = "protocolv"; @@ -118,7 +119,7 @@ lazy_static! { option_env!("VSCODE_CLI_SERVER_NAME_MAP").and_then(|s| serde_json::from_str(s).unwrap()); /// Whether i/o interactions are allowed in the current CLI. - pub static ref IS_A_TTY: bool = atty::is(atty::Stream::Stdin); + pub static ref IS_A_TTY: bool = std::io::stdin().is_terminal(); /// Whether i/o interactions are allowed in the current CLI. pub static ref COLORS_ENABLED: bool = *IS_A_TTY && std::env::var(NO_COLOR_ENV).is_err(); diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 93777852df2..b2e23cb4d69 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -18,8 +18,8 @@ pub mod tunnels; pub mod update_service; pub mod util; -mod download_cache; mod async_pipe; +mod download_cache; mod json_rpc; mod msgpack_rpc; mod rpc; diff --git a/cli/src/log.rs b/cli/src/log.rs index 1bce766a871..a7561a37f6c 100644 --- a/cli/src/log.rs +++ b/cli/src/log.rs @@ -26,21 +26,20 @@ pub fn next_counter() -> u32 { } // Log level -#[derive(clap::ArgEnum, PartialEq, Eq, PartialOrd, Clone, Copy, Debug, Serialize, Deserialize)] -#[derive(Default)] +#[derive( + clap::ValueEnum, PartialEq, Eq, PartialOrd, Clone, Copy, Debug, Serialize, Deserialize, Default, +)] pub enum Level { Trace = 0, Debug, #[default] - Info, + Info, Warn, Error, Critical, Off, } - - impl fmt::Display for Level { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { @@ -160,9 +159,21 @@ pub struct FileLogSink { file: Arc>, } +const FILE_LOG_SIZE_LIMIT: u64 = 1024 * 1024 * 10; // 10MB + impl FileLogSink { pub fn new(level: Level, path: &Path) -> std::io::Result { - let file = std::fs::File::create(path)?; + // Truncate the service log occasionally to avoid growing infinitely + if matches!(path.metadata(), Ok(m) if m.len() > FILE_LOG_SIZE_LIMIT) { + // ignore errors, can happen if another process is writing right now + let _ = std::fs::remove_file(path); + } + + let file = std::fs::OpenOptions::new() + .append(true) + .create(true) + .open(path)?; + Ok(Self { level, file: Arc::new(std::sync::Mutex::new(file)), @@ -344,8 +355,7 @@ impl log::Log for RustyLogger { // exclude noisy log modules: let src = match record.module_path() { - Some("russh::cipher") => return, - Some("russh::negotiation") => return, + Some("russh::cipher" | "russh::negotiation" | "russh::kex::dh") => return, Some(s) => s, None => "", }; diff --git a/cli/src/msgpack_rpc.rs b/cli/src/msgpack_rpc.rs index 0350c1bfd64..ef6b7782074 100644 --- a/cli/src/msgpack_rpc.rs +++ b/cli/src/msgpack_rpc.rs @@ -4,8 +4,9 @@ *--------------------------------------------------------------------------------------------*/ use bytes::Buf; +use serde::de::DeserializeOwned; use tokio::{ - io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, BufReader}, + io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt}, pin, sync::mpsc, }; @@ -18,7 +19,7 @@ use crate::{ sync::{Barrier, Receivable}, }, }; -use std::io; +use std::io::{self, Cursor, ErrorKind}; #[derive(Copy, Clone)] pub struct MsgPackSerializer {} @@ -35,21 +36,28 @@ impl Serialization for MsgPackSerializer { pub type MsgPackCaller = rpc::RpcCaller; -/// Creates a new RPC Builder that serializes to JSON. +/// Creates a new RPC Builder that serializes to msgpack. pub fn new_msgpack_rpc() -> rpc::RpcBuilder { rpc::RpcBuilder::new(MsgPackSerializer {}) } -pub async fn start_msgpack_rpc( - dispatcher: rpc::RpcDispatcher, - read: impl AsyncRead + Unpin, - mut write: impl AsyncWrite + Unpin, +/// Starting processing msgpack rpc over the given i/o. It's recommended that +/// the reader be passed in as a BufReader for efficiency. +pub async fn start_msgpack_rpc< + C: Send + Sync + 'static, + X: Clone, + S: Send + Sync + Serialization, + Read: AsyncRead + Unpin, + Write: AsyncWrite + Unpin, +>( + dispatcher: rpc::RpcDispatcher, + mut read: Read, + mut write: Write, mut msg_rx: impl Receivable>, - mut shutdown_rx: Barrier, -) -> io::Result> { + mut shutdown_rx: Barrier, +) -> io::Result<(Option, Read, Write)> { let (write_tx, mut write_rx) = mpsc::channel::>(8); - let mut read = BufReader::new(read); - let mut decoder = U32PrefixedCodec {}; + let mut decoder = MsgPackCodec::new(); let mut decoder_buf = bytes::BytesMut::new(); let shutdown_fut = shutdown_rx.wait(); @@ -61,7 +69,7 @@ pub async fn start_msgpack_rpc( r?; while let Some(frame) = decoder.decode(&mut decoder_buf)? { - match dispatcher.dispatch(&frame) { + match dispatcher.dispatch_with_partial(&frame.vec, frame.obj) { MaybeSync::Sync(Some(v)) => { let _ = write_tx.send(v).await; }, @@ -94,39 +102,94 @@ pub async fn start_msgpack_rpc( Some(m) = msg_rx.recv_msg() => { write.write_all(&m).await?; }, - r = &mut shutdown_fut => return Ok(r.ok()), + r = &mut shutdown_fut => return Ok((r.ok(), read, write)), } write.flush().await?; } } -/// Reader that reads length-prefixed msgpack messages in a cancellation-safe -/// way using Tokio's codecs. -pub struct U32PrefixedCodec {} +/// Reader that reads msgpack object messages in a cancellation-safe way using Tokio's codecs. +/// +/// rmp_serde does not support async reads, and does not plan to. But we know every +/// type in protocol is some kind of object, so by asking to deserialize the +/// requested object from a reader (repeatedly, if incomplete) we can +/// accomplish streaming. +pub struct MsgPackCodec { + _marker: std::marker::PhantomData, +} -const U32_SIZE: usize = 4; +impl MsgPackCodec { + pub fn new() -> Self { + Self { + _marker: std::marker::PhantomData, + } + } +} -impl tokio_util::codec::Decoder for U32PrefixedCodec { - type Item = Vec; +pub struct MsgPackDecoded { + pub obj: T, + pub vec: Vec, +} + +impl tokio_util::codec::Decoder for MsgPackCodec { + type Item = MsgPackDecoded; type Error = io::Error; fn decode(&mut self, src: &mut bytes::BytesMut) -> Result, Self::Error> { - if src.len() < 4 { - src.reserve(U32_SIZE - src.len()); - return Ok(None); - } + let bytes_ref = src.as_ref(); + let mut cursor = Cursor::new(bytes_ref); - let mut be_bytes = [0; U32_SIZE]; - be_bytes.copy_from_slice(&src[..U32_SIZE]); - let required_len = U32_SIZE + (u32::from_be_bytes(be_bytes) as usize); - if src.len() < required_len { - src.reserve(required_len - src.len()); - return Ok(None); + match rmp_serde::decode::from_read::<_, T>(&mut cursor) { + Err( + rmp_serde::decode::Error::InvalidDataRead(e) + | rmp_serde::decode::Error::InvalidMarkerRead(e), + ) if e.kind() == ErrorKind::UnexpectedEof => { + src.reserve(1024); + Ok(None) + } + Err(e) => Err(std::io::Error::new( + std::io::ErrorKind::InvalidData, + e.to_string(), + )), + Ok(obj) => { + let len = cursor.position() as usize; + let vec = src[..len].to_vec(); + src.advance(len); + Ok(Some(MsgPackDecoded { obj, vec })) + } } + } +} - let msg = src[U32_SIZE..required_len].to_vec(); - src.advance(required_len); - Ok(Some(msg)) +#[cfg(test)] +mod tests { + use serde::{Deserialize, Serialize}; + + use super::*; + + #[derive(Serialize, Deserialize, PartialEq, Eq, Debug)] + pub struct Msg { + pub x: i32, + } + + #[test] + fn test_protocol() { + let mut c = MsgPackCodec::::new(); + let mut buf = bytes::BytesMut::new(); + + assert!(c.decode(&mut buf).unwrap().is_none()); + + buf.extend_from_slice(rmp_serde::to_vec_named(&Msg { x: 1 }).unwrap().as_slice()); + buf.extend_from_slice(rmp_serde::to_vec_named(&Msg { x: 2 }).unwrap().as_slice()); + + assert_eq!( + c.decode(&mut buf).unwrap().expect("expected msg1").obj, + Msg { x: 1 } + ); + assert_eq!( + c.decode(&mut buf).unwrap().expect("expected msg1").obj, + Msg { x: 2 } + ); } } diff --git a/cli/src/options.rs b/cli/src/options.rs index ca8fa7b9695..9423a6da92e 100644 --- a/cli/src/options.rs +++ b/cli/src/options.rs @@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize}; use crate::constants::{APPLICATION_NAME_MAP, PRODUCT_NAME_LONG_MAP, SERVER_NAME_MAP}; -#[derive(clap::ArgEnum, Copy, Clone, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)] +#[derive(clap::ValueEnum, Copy, Clone, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)] pub enum Quality { #[serde(rename = "stable")] Stable, @@ -95,7 +95,7 @@ impl TryFrom<&str> for Quality { } } -#[derive(clap::ArgEnum, Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[derive(clap::ValueEnum, Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub enum TelemetryLevel { Off, Crash, diff --git a/cli/src/rpc.rs b/cli/src/rpc.rs index 28dfc0efb47..a9a66153735 100644 --- a/cli/src/rpc.rs +++ b/cli/src/rpc.rs @@ -104,6 +104,10 @@ impl RpcMethodBuilder { R: Serialize, F: Fn(P, &C) -> Result + Send + Sync + 'static, { + if self.methods.contains_key(method_name) { + panic!("Method already registered: {}", method_name); + } + let serial = self.serializer.clone(); let context = self.context.clone(); self.methods.insert( @@ -113,7 +117,7 @@ impl RpcMethodBuilder { Ok(p) => p, Err(err) => { return id.map(|id| { - serial.serialize(&ErrorResponse { + serial.serialize(ErrorResponse { id, error: ResponseError { code: 0, @@ -127,7 +131,7 @@ impl RpcMethodBuilder { match callback(param.params, &context) { Ok(result) => id.map(|id| serial.serialize(&SuccessResponse { id, result })), Err(err) => id.map(|id| { - serial.serialize(&ErrorResponse { + serial.serialize(ErrorResponse { id, error: ResponseError { code: -1, @@ -157,7 +161,7 @@ impl RpcMethodBuilder { Ok(p) => p, Err(err) => { return future::ready(id.map(|id| { - serial.serialize(&ErrorResponse { + serial.serialize(ErrorResponse { id, error: ResponseError { code: 0, @@ -178,7 +182,7 @@ impl RpcMethodBuilder { id.map(|id| serial.serialize(&SuccessResponse { id, result })) } Err(err) => id.map(|id| { - serial.serialize(&ErrorResponse { + serial.serialize(ErrorResponse { id, error: ResponseError { code: -1, @@ -218,7 +222,7 @@ impl RpcMethodBuilder { return ( None, future::ready(id.map(|id| { - serial.serialize(&ErrorResponse { + serial.serialize(ErrorResponse { id, error: ResponseError { code: 0, @@ -251,7 +255,7 @@ impl RpcMethodBuilder { match callback(servers, param.params, context).await { Ok(r) => id.map(|id| serial.serialize(&SuccessResponse { id, result: r })), Err(err) => id.map(|id| { - serial.serialize(&ErrorResponse { + serial.serialize(ErrorResponse { id, error: ResponseError { code: -1, @@ -269,28 +273,21 @@ impl RpcMethodBuilder { /// Builds into a usable, sync rpc dispatcher. pub fn build(mut self, log: log::Logger) -> RpcDispatcher { - let streams: Arc>>> = - Arc::new(tokio::sync::Mutex::new(HashMap::new())); + let streams = Streams::default(); let s1 = streams.clone(); self.register_async(METHOD_STREAM_ENDED, move |m: StreamEndedParams, _| { let s1 = s1.clone(); async move { - s1.lock().await.remove(&m.stream); + s1.remove(m.stream).await; Ok(()) } }); let s2 = streams.clone(); - self.register_async(METHOD_STREAM_DATA, move |m: StreamDataIncomingParams, _| { - let s2 = s2.clone(); - async move { - let mut lock = s2.lock().await; - if let Some(stream) = lock.get_mut(&m.stream) { - let _ = stream.write_all(&m.segment).await; - } - Ok(()) - } + self.register_sync(METHOD_STREAM_DATA, move |m: StreamDataIncomingParams, _| { + s2.write(m.stream, m.segment); + Ok(()) }); RpcDispatcher { @@ -394,7 +391,7 @@ pub struct RpcDispatcher { serializer: Arc, methods: Arc>, calls: Arc>>, - streams: Arc>>>, + streams: Streams, } static MESSAGE_ID_COUNTER: AtomicU32 = AtomicU32::new(0); @@ -410,13 +407,17 @@ impl RpcDispatcher { /// The future or return result will be optional bytes that should be sent /// back to the socket. pub fn dispatch(&self, body: &[u8]) -> MaybeSync { - let partial = match self.serializer.deserialize::(body) { - Ok(b) => b, + match self.serializer.deserialize::(body) { + Ok(partial) => self.dispatch_with_partial(body, partial), Err(_err) => { warning!(self.log, "Failed to deserialize request, hex: {:X?}", body); - return MaybeSync::Sync(None); + MaybeSync::Sync(None) } - }; + } + } + + /// Like dispatch, but allows passing an existing PartialIncoming. + pub fn dispatch_with_partial(&self, body: &[u8], partial: PartialIncoming) -> MaybeSync { let id = partial.id; if let Some(method_name) = partial.method { @@ -426,7 +427,7 @@ impl RpcDispatcher { Some(Method::Async(callback)) => MaybeSync::Future(callback(id, body)), Some(Method::Duplex(callback)) => MaybeSync::Stream(callback(id, body)), None => MaybeSync::Sync(id.map(|id| { - self.serializer.serialize(&ErrorResponse { + self.serializer.serialize(ErrorResponse { id, error: ResponseError { code: -1, @@ -473,10 +474,9 @@ impl RpcDispatcher { return; } - let mut streams_map = self.streams.lock().await; for (stream_id, duplex) in dto.streams { let (mut read, write) = tokio::io::split(duplex); - streams_map.insert(stream_id, write); + self.streams.insert(stream_id, write); let write_tx = write_tx.clone(); let serial = self.serializer.clone(); @@ -528,6 +528,90 @@ impl RpcDispatcher { } } +struct StreamRec { + write: Option>, + q: Vec>, +} + +#[derive(Clone, Default)] +struct Streams { + map: Arc>>, +} + +impl Streams { + pub async fn remove(&self, id: u32) { + let stream = self.map.lock().unwrap().remove(&id); + if let Some(s) = stream { + // if there's no 'write' right now, it'll shut down in the write_loop + if let Some(mut w) = s.write { + let _ = w.shutdown().await; + } + } + } + + pub fn write(&self, id: u32, buf: Vec) { + let mut map = self.map.lock().unwrap(); + if let Some(s) = map.get_mut(&id) { + s.q.push(buf); + + if let Some(w) = s.write.take() { + tokio::spawn(write_loop(id, w, self.map.clone())); + } + } + } + + pub fn insert(&self, id: u32, stream: WriteHalf) { + self.map.lock().unwrap().insert( + id, + StreamRec { + write: Some(stream), + q: Vec::new(), + }, + ); + } +} + +/// Write loop started by `Streams.write`. It takes the WriteHalf, and +/// runs until there's no more items in the 'write queue'. At that point, if the +/// record still exists in the `streams` (i.e. we haven't shut down), it'll +/// return the WriteHalf so that the next `write` call starts +/// the loop again. Otherwise, it'll shut down the WriteHalf. +/// +/// This is the equivalent of the same write_loop in the server_multiplexer. +/// I couldn't figure out a nice way to abstract it without introducing +/// performance overhead... +async fn write_loop( + id: u32, + mut w: WriteHalf, + streams: Arc>>, +) { + let mut items_vec = vec![]; + loop { + { + let mut lock = streams.lock().unwrap(); + let stream_rec = match lock.get_mut(&id) { + Some(b) => b, + None => break, + }; + + if stream_rec.q.is_empty() { + stream_rec.write = Some(w); + return; + } + + std::mem::swap(&mut stream_rec.q, &mut items_vec); + } + + for item in items_vec.drain(..) { + if w.write_all(&item).await.is_err() { + break; + } + } + } + + let _ = w.shutdown().await; // got here from `break` above, meaning our record got cleared. Close the bridge if so +} + const METHOD_STREAMS_STARTED: &str = "streams_started"; const METHOD_STREAM_DATA: &str = "stream_data"; const METHOD_STREAM_ENDED: &str = "stream_ended"; @@ -536,8 +620,8 @@ trait AssertIsSync: Sync {} impl AssertIsSync for RpcDispatcher {} /// Approximate shape that is used to determine what kind of data is incoming. -#[derive(Deserialize)] -struct PartialIncoming { +#[derive(Deserialize, Debug)] +pub struct PartialIncoming { pub id: Option, pub method: Option, pub error: Option, diff --git a/cli/src/singleton.rs b/cli/src/singleton.rs index 0ea9cda2a8a..635c400fb0f 100644 --- a/cli/src/singleton.rs +++ b/cli/src/singleton.rs @@ -53,12 +53,12 @@ struct LockFileMatter { /// Tries to acquire the singleton homed at the given lock file, either starting /// a new singleton if it doesn't exist, or connecting otherwise. -pub async fn acquire_singleton(lock_file: PathBuf) -> Result { +pub async fn acquire_singleton(lock_file: &Path) -> Result { let file = OpenOptions::new() .read(true) .write(true) .create(true) - .open(&lock_file) + .open(lock_file) .map_err(CodeError::SingletonLockfileOpenFailed)?; match FileLock::acquire(file) { @@ -158,7 +158,7 @@ mod tests { #[tokio::test] async fn test_acquires_singleton() { let dir = tempfile::tempdir().expect("expected to make temp dir"); - let s = acquire_singleton(dir.path().join("lock")) + let s = acquire_singleton(&dir.path().join("lock")) .await .expect("expected to acquire"); @@ -172,7 +172,7 @@ mod tests { async fn test_acquires_client() { let dir = tempfile::tempdir().expect("expected to make temp dir"); let lockfile = dir.path().join("lock"); - let s1 = acquire_singleton(lockfile.clone()) + let s1 = acquire_singleton(&lockfile) .await .expect("expected to acquire1"); match s1 { @@ -182,7 +182,7 @@ mod tests { _ => panic!("expected to be singleton"), }; - let s2 = acquire_singleton(lockfile) + let s2 = acquire_singleton(&lockfile) .await .expect("expected to acquire2"); match s2 { diff --git a/cli/src/state.rs b/cli/src/state.rs index af0d18e160b..1b1ff343da5 100644 --- a/cli/src/state.rs +++ b/cli/src/state.rs @@ -187,6 +187,14 @@ impl LauncherPaths { )) } + /// Lockfile for port forwarding + pub fn forwarding_lockfile(&self) -> PathBuf { + self.root.join(format!( + "forwarding-{}.lock", + VSCODE_CLI_QUALITY.unwrap_or("oss") + )) + } + /// Suggested path for tunnel service logs, when using file logs pub fn service_log_file(&self) -> PathBuf { self.root.join("tunnel-service.log") diff --git a/cli/src/tunnels.rs b/cli/src/tunnels.rs index ebab9475988..700516abb1f 100644 --- a/cli/src/tunnels.rs +++ b/cli/src/tunnels.rs @@ -7,11 +7,14 @@ pub mod code_server; pub mod dev_tunnels; pub mod legal; pub mod paths; +pub mod protocol; pub mod shutdown_signal; pub mod singleton_client; pub mod singleton_server; -pub mod protocol; +pub mod forwarding; +mod wsl_detect; +mod challenge; mod control_server; mod nosleep; #[cfg(target_os = "linux")] @@ -31,11 +34,9 @@ mod service_macos; #[cfg(target_os = "windows")] mod service_windows; mod socket_signal; -mod wsl_server; -pub use control_server::{serve, Next}; +pub use control_server::{serve, serve_stream, Next, ServeStreamParams, AuthRequired}; pub use nosleep::SleepInhibitor; pub use service::{ create_service_manager, ServiceContainer, ServiceManager, SERVICE_LOG_FILE_NAME, }; -pub use wsl_server::serve_wsl; diff --git a/cli/src/tunnels/challenge.rs b/cli/src/tunnels/challenge.rs new file mode 100644 index 00000000000..81540004844 --- /dev/null +++ b/cli/src/tunnels/challenge.rs @@ -0,0 +1,42 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +#[cfg(not(feature = "vsda"))] +pub fn create_challenge() -> String { + use rand::distributions::{Alphanumeric, DistString}; + Alphanumeric.sample_string(&mut rand::thread_rng(), 16) +} + +#[cfg(not(feature = "vsda"))] +pub fn sign_challenge(challenge: &str) -> String { + use base64::{engine::general_purpose as b64, Engine as _}; + use sha2::{Digest, Sha256}; + let mut hash = Sha256::new(); + hash.update(challenge.as_bytes()); + let result = hash.finalize(); + b64::URL_SAFE_NO_PAD.encode(result) +} + +#[cfg(not(feature = "vsda"))] +pub fn verify_challenge(challenge: &str, response: &str) -> bool { + sign_challenge(challenge) == response +} + +#[cfg(feature = "vsda")] +pub fn create_challenge() -> String { + use rand::distributions::{Alphanumeric, DistString}; + let str = Alphanumeric.sample_string(&mut rand::thread_rng(), 16); + vsda::create_new_message(&str) +} + +#[cfg(feature = "vsda")] +pub fn sign_challenge(challenge: &str) -> String { + vsda::sign(challenge) +} + +#[cfg(feature = "vsda")] +pub fn verify_challenge(challenge: &str, response: &str) -> bool { + vsda::validate(challenge, response) +} diff --git a/cli/src/tunnels/code_server.rs b/cli/src/tunnels/code_server.rs index 1246e1c9441..5bc5e39514a 100644 --- a/cli/src/tunnels/code_server.rs +++ b/cli/src/tunnels/code_server.rs @@ -541,6 +541,15 @@ impl<'a> ServerBuilder<'a> { debug!(self.logger, "Starting server with command... {:?}", cmd); + // On Windows spawning a code-server binary will run cmd.exe /c C:\path\to\code-server.cmd... + // This spawns a cmd.exe window for the user, which if they close will kill the code-server process + // and disconnect the tunnel. To prevent this, pass the CREATE_NO_WINDOW flag to the Command + // only on Windows. + // Original issue: https://github.com/microsoft/vscode/issues/184058 + // Partial fix: https://github.com/microsoft/vscode/pull/184621 + #[cfg(target_os = "windows")] + let cmd = cmd.creation_flags(winapi::um::winbase::CREATE_NO_WINDOW); + let child = cmd .stderr(std::process::Stdio::piped()) .stdout(std::process::Stdio::piped()) @@ -566,7 +575,17 @@ impl<'a> ServerBuilder<'a> { } fn get_base_command(&self) -> Command { + #[cfg(not(windows))] let mut cmd = Command::new(&self.server_paths.executable); + #[cfg(windows)] + let mut cmd = { + let mut cmd = Command::new("cmd"); + cmd.arg("/Q"); + cmd.arg("/C"); + cmd.arg(&self.server_paths.executable); + cmd + }; + cmd.stdin(std::process::Stdio::null()) .args(self.server_params.code_server_args.command_arguments()); cmd diff --git a/cli/src/tunnels/control_server.rs b/cli/src/tunnels/control_server.rs index 67a0bcf64ac..6f8c1060e1f 100644 --- a/cli/src/tunnels/control_server.rs +++ b/cli/src/tunnels/control_server.rs @@ -5,16 +5,15 @@ use crate::async_pipe::get_socket_rw_stream; use crate::constants::{CONTROL_PORT, PRODUCT_NAME_LONG}; use crate::log; -use crate::msgpack_rpc::U32PrefixedCodec; -use crate::rpc::{MaybeSync, RpcBuilder, RpcDispatcher, Serialization}; +use crate::msgpack_rpc::{new_msgpack_rpc, start_msgpack_rpc, MsgPackCodec, MsgPackSerializer}; +use crate::rpc::{MaybeSync, RpcBuilder, RpcCaller, RpcDispatcher}; use crate::self_update::SelfUpdate; use crate::state::LauncherPaths; -use crate::tunnels::protocol::HttpRequestParams; +use crate::tunnels::protocol::{HttpRequestParams, METHOD_CHALLENGE_ISSUE}; use crate::tunnels::socket_signal::CloseReason; use crate::update_service::{Platform, Release, TargetKind, UpdateService}; use crate::util::errors::{ - wrap, AnyError, CodeError, InvalidRpcDataError, MismatchedLaunchModeError, - NoAttachedServerError, + wrap, AnyError, CodeError, MismatchedLaunchModeError, NoAttachedServerError, }; use crate::util::http::{ DelegatedHttpRequest, DelegatedSimpleHttp, FallbackSimpleHttp, ReqwestSimpleHttp, @@ -22,7 +21,7 @@ use crate::util::http::{ use crate::util::io::SilentCopyProgress; use crate::util::is_integrated_cli; use crate::util::os::os_release; -use crate::util::sync::{new_barrier, Barrier}; +use crate::util::sync::{new_barrier, Barrier, BarrierOpener}; use futures::stream::FuturesUnordered; use futures::FutureExt; @@ -31,6 +30,7 @@ use opentelemetry::KeyValue; use std::collections::HashMap; use std::process::Stdio; use tokio::pin; +use tokio::process::{ChildStderr, ChildStdin}; use tokio_util::codec::Decoder; use std::sync::atomic::{AtomicBool, AtomicU32, AtomicUsize, Ordering}; @@ -39,6 +39,7 @@ use std::time::Instant; use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, BufReader, DuplexStream}; use tokio::sync::{mpsc, Mutex}; +use super::challenge::{create_challenge, sign_challenge, verify_challenge}; use super::code_server::{ download_cli_into_cache, AnyCodeServer, CodeServerArgs, ServerBuilder, ServerParamsRaw, SocketCodeServer, @@ -47,11 +48,12 @@ use super::dev_tunnels::ActiveTunnel; use super::paths::prune_stopped_servers; use super::port_forwarder::{PortForwarding, PortForwardingProcessor}; use super::protocol::{ - AcquireCliParams, CallServerHttpParams, CallServerHttpResult, ClientRequestMethod, EmptyObject, - ForwardParams, ForwardResult, FsStatRequest, FsStatResponse, GetEnvResponse, - GetHostnameResponse, HttpBodyParams, HttpHeadersParams, ServeParams, ServerLog, - ServerMessageParams, SpawnParams, SpawnResult, ToClientRequest, UnforwardParams, UpdateParams, - UpdateResult, VersionParams, + AcquireCliParams, CallServerHttpParams, CallServerHttpResult, ChallengeIssueParams, + ChallengeIssueResponse, ChallengeVerifyParams, ClientRequestMethod, EmptyObject, ForwardParams, + ForwardResult, FsStatRequest, FsStatResponse, GetEnvResponse, GetHostnameResponse, + HttpBodyParams, HttpHeadersParams, ServeParams, ServerLog, ServerMessageParams, SpawnParams, + SpawnResult, ToClientRequest, UnforwardParams, UpdateParams, UpdateResult, VersionResponse, + METHOD_CHALLENGE_VERIFY, }; use super::server_bridge::ServerBridge; use super::server_multiplexer::ServerMultiplexer; @@ -68,6 +70,8 @@ struct HandlerContext { log: log::Logger, /// Whether the server update during the handler session. did_update: Arc, + /// Whether authentication is still required on the socket. + auth_state: Arc>, /// A loopback channel to talk to the socket server task. socket_tx: mpsc::Sender, /// Configured launcher paths. @@ -79,7 +83,7 @@ struct HandlerContext { // the cli arguments used to start the code server code_server_args: CodeServerArgs, /// port forwarding functionality - port_forwarding: PortForwarding, + port_forwarding: Option, /// install platform for the VS Code server platform: Platform, /// http client to make download/update requests @@ -88,6 +92,16 @@ struct HandlerContext { http_requests: HttpRequestsMap, } +/// Handler auth state. +enum AuthState { + /// Auth is required, we're waiting for the client to send its challenge optionally bearing a token. + WaitingForChallenge(Option), + /// A challenge has been issued. Waiting for a verification. + ChallengeIssued(String), + /// Auth is no longer required. + Authenticated, +} + static MESSAGE_ID_COUNTER: AtomicU32 = AtomicU32::new(0); // Gets a next incrementing number that can be used in logs @@ -195,7 +209,14 @@ pub async fn serve( debug!(own_log, "Serving new connection"); let (writehalf, readhalf) = socket.into_split(); - let stats = process_socket(own_exit, readhalf, writehalf, own_log, own_tx, own_paths, own_code_server_args, own_forwarding, platform).with_context(cx.clone()).await; + let stats = process_socket(readhalf, writehalf, own_tx, Some(own_forwarding), ServeStreamParams { + log: own_log, + launcher_paths: own_paths, + code_server_args: own_code_server_args, + platform, + exit_barrier: own_exit, + requires_auth: AuthRequired::None, + }).with_context(cx.clone()).await; cx.span().add_event( "socket.bandwidth", @@ -206,69 +227,100 @@ pub async fn serve( ], ); cx.span().end(); - }); + }); } } } } -struct SocketStats { +#[derive(Clone)] +pub enum AuthRequired { + None, + VSDA, + VSDAWithToken(String), +} + +#[derive(Clone)] +pub struct ServeStreamParams { + pub log: log::Logger, + pub launcher_paths: LauncherPaths, + pub code_server_args: CodeServerArgs, + pub platform: Platform, + pub requires_auth: AuthRequired, + pub exit_barrier: Barrier, +} + +pub async fn serve_stream( + readhalf: impl AsyncRead + Send + Unpin + 'static, + writehalf: impl AsyncWrite + Unpin, + params: ServeStreamParams, +) -> SocketStats { + // Currently the only server signal is respawn, that doesn't have much meaning + // when serving a stream, so make an ignored channel. + let (server_rx, server_tx) = mpsc::channel(1); + drop(server_tx); + + process_socket(readhalf, writehalf, server_rx, None, params).await +} + +pub struct SocketStats { rx: usize, tx: usize, } -#[derive(Copy, Clone)] -struct MsgPackSerializer {} - -impl Serialization for MsgPackSerializer { - fn serialize(&self, value: impl serde::Serialize) -> Vec { - rmp_serde::to_vec_named(&value).expect("expected to serialize") - } - - fn deserialize(&self, b: &[u8]) -> Result { - rmp_serde::from_slice(b).map_err(|e| InvalidRpcDataError(e.to_string()).into()) - } -} - -#[allow(clippy::too_many_arguments)] // necessary here -async fn process_socket( - mut exit_barrier: Barrier<()>, - readhalf: impl AsyncRead + Send + Unpin + 'static, - mut writehalf: impl AsyncWrite + Unpin, +#[allow(clippy::too_many_arguments)] +fn make_socket_rpc( log: log::Logger, - server_tx: mpsc::Sender, + socket_tx: mpsc::Sender, + http_delegated: DelegatedSimpleHttp, launcher_paths: LauncherPaths, code_server_args: CodeServerArgs, - port_forwarding: PortForwarding, + port_forwarding: Option, + requires_auth: AuthRequired, platform: Platform, -) -> SocketStats { - let (socket_tx, mut socket_rx) = mpsc::channel(4); - let rx_counter = Arc::new(AtomicUsize::new(0)); +) -> RpcDispatcher { let http_requests = Arc::new(std::sync::Mutex::new(HashMap::new())); let server_bridges = ServerMultiplexer::new(); - let (http_delegated, mut http_rx) = DelegatedSimpleHttp::new(log.clone()); let mut rpc = RpcBuilder::new(MsgPackSerializer {}).methods(HandlerContext { did_update: Arc::new(AtomicBool::new(false)), - socket_tx: socket_tx.clone(), + auth_state: Arc::new(std::sync::Mutex::new(match requires_auth { + AuthRequired::VSDAWithToken(t) => AuthState::WaitingForChallenge(Some(t)), + AuthRequired::VSDA => AuthState::WaitingForChallenge(None), + AuthRequired::None => AuthState::Authenticated, + })), + socket_tx, log: log.clone(), launcher_paths, code_server_args, code_server: Arc::new(Mutex::new(None)), - server_bridges: server_bridges.clone(), + server_bridges, port_forwarding, platform, http: Arc::new(FallbackSimpleHttp::new( ReqwestSimpleHttp::new(), http_delegated, )), - http_requests: http_requests.clone(), + http_requests, }); rpc.register_sync("ping", |_: EmptyObject, _| Ok(EmptyObject {})); rpc.register_sync("gethostname", |_: EmptyObject, _| handle_get_hostname()); - rpc.register_sync("fs_stat", |p: FsStatRequest, _| handle_stat(p.path)); - rpc.register_sync("get_env", |_: EmptyObject, _| handle_get_env()); + rpc.register_sync("fs_stat", |p: FsStatRequest, c| { + ensure_auth(&c.auth_state)?; + handle_stat(p.path) + }); + rpc.register_sync("get_env", |_: EmptyObject, c| { + ensure_auth(&c.auth_state)?; + handle_get_env() + }); + rpc.register_sync(METHOD_CHALLENGE_ISSUE, |p: ChallengeIssueParams, c| { + handle_challenge_issue(p, &c.auth_state) + }); + rpc.register_sync(METHOD_CHALLENGE_VERIFY, |p: ChallengeVerifyParams, c| { + handle_challenge_verify(p.response, &c.auth_state) + }); rpc.register_async("serve", move |params: ServeParams, c| async move { + ensure_auth(&c.auth_state)?; handle_serve(c, params).await }); rpc.register_async("update", |p: UpdateParams, c| async move { @@ -286,15 +338,19 @@ async fn process_socket( handle_call_server_http(code_server, p).await }); rpc.register_async("forward", |p: ForwardParams, c| async move { + ensure_auth(&c.auth_state)?; handle_forward(&c.log, &c.port_forwarding, p).await }); rpc.register_async("unforward", |p: UnforwardParams, c| async move { + ensure_auth(&c.auth_state)?; handle_unforward(&c.log, &c.port_forwarding, p).await }); rpc.register_async("acquire_cli", |p: AcquireCliParams, c| async move { + ensure_auth(&c.auth_state)?; handle_acquire_cli(&c.launcher_paths, &c.http, &c.log, p).await }); rpc.register_duplex("spawn", 3, |mut streams, p: SpawnParams, c| async move { + ensure_auth(&c.auth_state)?; handle_spawn( &c.log, p, @@ -304,13 +360,28 @@ async fn process_socket( ) .await }); + rpc.register_duplex( + "spawn_cli", + 3, + |mut streams, p: SpawnParams, c| async move { + ensure_auth(&c.auth_state)?; + handle_spawn_cli( + &c.log, + p, + streams.remove(0), + streams.remove(0), + streams.remove(0), + ) + .await + }, + ); rpc.register_sync("httpheaders", |p: HttpHeadersParams, c| { if let Some(req) = c.http_requests.lock().unwrap().get(&p.req_id) { req.initial_response(p.status_code, p.headers); } Ok(EmptyObject {}) }); - rpc.register_sync("unforward", move |p: HttpBodyParams, c| { + rpc.register_sync("httpbody", move |p: HttpBodyParams, c| { let mut reqs = c.http_requests.lock().unwrap(); if let Some(req) = reqs.get(&p.req_id) { if !p.segment.is_empty() { @@ -322,15 +393,65 @@ async fn process_socket( } Ok(EmptyObject {}) }); + rpc.register_sync( + "version", + |_: EmptyObject, _| Ok(VersionResponse::default()), + ); + + rpc.build(log) +} + +fn ensure_auth(is_authed: &Arc>) -> Result<(), AnyError> { + if let AuthState::Authenticated = &*is_authed.lock().unwrap() { + Ok(()) + } else { + Err(CodeError::ServerAuthRequired.into()) + } +} + +#[allow(clippy::too_many_arguments)] // necessary here +async fn process_socket( + readhalf: impl AsyncRead + Send + Unpin + 'static, + mut writehalf: impl AsyncWrite + Unpin, + server_tx: mpsc::Sender, + port_forwarding: Option, + params: ServeStreamParams, +) -> SocketStats { + let ServeStreamParams { + mut exit_barrier, + log, + launcher_paths, + code_server_args, + platform, + requires_auth, + } = params; + + let (http_delegated, mut http_rx) = DelegatedSimpleHttp::new(log.clone()); + let (socket_tx, mut socket_rx) = mpsc::channel(4); + let rx_counter = Arc::new(AtomicUsize::new(0)); + let http_requests = Arc::new(std::sync::Mutex::new(HashMap::new())); + + let already_authed = matches!(requires_auth, AuthRequired::None); + let rpc = make_socket_rpc( + log.clone(), + socket_tx.clone(), + http_delegated, + launcher_paths, + code_server_args, + port_forwarding, + requires_auth, + platform, + ); { let log = log.clone(); let rx_counter = rx_counter.clone(); let socket_tx = socket_tx.clone(); let exit_barrier = exit_barrier.clone(); - let rpc = rpc.build(log.clone()); tokio::spawn(async move { - send_version(&socket_tx).await; + if already_authed { + send_version(&socket_tx).await; + } if let Err(e) = handle_socket_read(&log, readhalf, exit_barrier, &socket_tx, rx_counter, &rpc).await @@ -350,6 +471,10 @@ async fn process_socket( } ctx.dispose().await; + + let _ = socket_tx + .send(SocketSignal::CloseWith(CloseReason("eof".to_string()))) + .await; }); } @@ -408,7 +533,7 @@ async fn process_socket( async fn send_version(tx: &mpsc::Sender) { tx.send(SocketSignal::from_message(&ToClientRequest { id: None, - params: ClientRequestMethod::version(VersionParams::default()), + params: ClientRequestMethod::version(VersionResponse::default()), })) .await .ok(); @@ -416,13 +541,13 @@ async fn send_version(tx: &mpsc::Sender) { async fn handle_socket_read( _log: &log::Logger, readhalf: impl AsyncRead + Unpin, - mut closer: Barrier<()>, + mut closer: Barrier, socket_tx: &mpsc::Sender, rx_counter: Arc, rpc: &RpcDispatcher, ) -> Result<(), std::io::Error> { let mut readhalf = BufReader::new(readhalf); - let mut decoder = U32PrefixedCodec {}; + let mut decoder = MsgPackCodec::new(); let mut decoder_buf = bytes::BytesMut::new(); loop { @@ -431,10 +556,14 @@ async fn handle_socket_read( _ = closer.wait() => Err(std::io::Error::new(std::io::ErrorKind::UnexpectedEof, "eof")), }?; + if read_len == 0 { + return Ok(()); + } + rx_counter.fetch_add(read_len, Ordering::Relaxed); while let Some(frame) = decoder.decode(&mut decoder_buf)? { - match rpc.dispatch(&frame) { + match rpc.dispatch_with_partial(&frame.vec, frame.obj) { MaybeSync::Sync(Some(v)) => { if socket_tx.send(SocketSignal::Send(v)).await.is_err() { return Ok(()); @@ -492,6 +621,7 @@ async fn handle_serve( ) -> Result { // fill params.extensions into code_server_args.install_extensions let mut csa = c.code_server_args.clone(); + csa.connection_token = params.connection_token.or(csa.connection_token); csa.install_extensions.extend(params.extensions.into_iter()); let params_raw = ServerParamsRaw { @@ -704,11 +834,53 @@ fn handle_get_env() -> Result { }) } +fn handle_challenge_issue( + params: ChallengeIssueParams, + auth_state: &Arc>, +) -> Result { + let challenge = create_challenge(); + + let mut auth_state = auth_state.lock().unwrap(); + if let AuthState::WaitingForChallenge(Some(s)) = &*auth_state { + println!("looking for token {}, got {:?}", s, params.token); + match ¶ms.token { + Some(t) if s != t => return Err(CodeError::AuthChallengeBadToken.into()), + None => return Err(CodeError::AuthChallengeBadToken.into()), + _ => {} + } + } + + *auth_state = AuthState::ChallengeIssued(challenge.clone()); + Ok(ChallengeIssueResponse { challenge }) +} + +fn handle_challenge_verify( + response: String, + auth_state: &Arc>, +) -> Result { + let mut auth_state = auth_state.lock().unwrap(); + + match &*auth_state { + AuthState::Authenticated => Ok(EmptyObject {}), + AuthState::WaitingForChallenge(_) => Err(CodeError::AuthChallengeNotIssued.into()), + AuthState::ChallengeIssued(c) => match verify_challenge(c, &response) { + false => Err(CodeError::AuthChallengeNotIssued.into()), + true => { + *auth_state = AuthState::Authenticated; + Ok(EmptyObject {}) + } + }, + } +} + async fn handle_forward( log: &log::Logger, - port_forwarding: &PortForwarding, + port_forwarding: &Option, params: ForwardParams, ) -> Result { + let port_forwarding = port_forwarding + .as_ref() + .ok_or(CodeError::PortForwardingNotAvailable)?; info!(log, "Forwarding port {}", params.port); let uri = port_forwarding.forward(params.port).await?; Ok(ForwardResult { uri }) @@ -716,9 +888,12 @@ async fn handle_forward( async fn handle_unforward( log: &log::Logger, - port_forwarding: &PortForwarding, + port_forwarding: &Option, params: UnforwardParams, ) -> Result { + let port_forwarding = port_forwarding + .as_ref() + .ok_or(CodeError::PortForwardingNotAvailable)?; info!(log, "Unforwarding port {}", params.port); port_forwarding.unforward(params.port).await?; Ok(EmptyObject {}) @@ -818,17 +993,17 @@ async fn handle_spawn( stderr: Option, ) -> Result where - Stdin: AsyncRead + Unpin + Send, - StdoutAndErr: AsyncWrite + Unpin + Send, + Stdin: AsyncRead + Unpin + Send + 'static, + StdoutAndErr: AsyncWrite + Unpin + Send + 'static, { debug!( log, "requested to spawn {} with args {:?}", params.command, params.args ); - macro_rules! pipe_if_some { + macro_rules! pipe_if { ($e: expr) => { - if $e.is_some() { + if $e { Stdio::piped() } else { Stdio::null() @@ -839,9 +1014,9 @@ where let mut p = tokio::process::Command::new(¶ms.command); p.args(¶ms.args); p.envs(¶ms.env); - p.stdin(pipe_if_some!(stdin)); - p.stdout(pipe_if_some!(stdout)); - p.stderr(pipe_if_some!(stderr)); + p.stdin(pipe_if!(stdin.is_some())); + p.stdout(pipe_if!(stdin.is_some())); + p.stderr(pipe_if!(stderr.is_some())); if let Some(cwd) = ¶ms.cwd { p.current_dir(cwd); } @@ -859,7 +1034,71 @@ where futs.push(async move { tokio::io::copy(&mut a, &mut b).await }.boxed()); } - let closed = p.wait(); + wait_for_process_exit(log, ¶ms.command, p, futs).await +} + +async fn handle_spawn_cli( + log: &log::Logger, + params: SpawnParams, + mut protocol_in: DuplexStream, + mut protocol_out: DuplexStream, + mut log_out: DuplexStream, +) -> Result { + debug!( + log, + "requested to spawn cli {} with args {:?}", params.command, params.args + ); + + let mut p = tokio::process::Command::new(¶ms.command); + p.args(¶ms.args); + + // CLI args to spawn a server; contracted with clients that they should _not_ provide these. + p.arg("--verbose"); + p.arg("command-shell"); + + p.envs(¶ms.env); + p.stdin(Stdio::piped()); + p.stdout(Stdio::piped()); + p.stderr(Stdio::piped()); + if let Some(cwd) = ¶ms.cwd { + p.current_dir(cwd); + } + + let mut p = p.spawn().map_err(CodeError::ProcessSpawnFailed)?; + + let mut stdin = p.stdin.take().unwrap(); + let mut stdout = p.stdout.take().unwrap(); + let mut stderr = p.stderr.take().unwrap(); + + // Start handling logs while doing the handshake in case there's some kind of error + let log_pump = tokio::spawn(async move { tokio::io::copy(&mut stdout, &mut log_out).await }); + + // note: intentionally do not wrap stdin in a bufreader, since we don't + // want to read anything other than our handshake messages. + if let Err(e) = spawn_do_child_authentication(log, &mut stdin, &mut stderr).await { + warning!(log, "failed to authenticate with child process {}", e); + let _ = p.kill().await; + return Err(e.into()); + } + + debug!(log, "cli authenticated, attaching stdio"); + let futs = FuturesUnordered::new(); + futs.push(async move { tokio::io::copy(&mut protocol_in, &mut stdin).await }.boxed()); + futs.push(async move { tokio::io::copy(&mut stderr, &mut protocol_out).await }.boxed()); + futs.push(async move { log_pump.await.unwrap() }.boxed()); + + wait_for_process_exit(log, ¶ms.command, p, futs).await +} + +type TokioCopyFuture = dyn futures::Future> + Send; + +async fn wait_for_process_exit( + log: &log::Logger, + command: &str, + mut process: tokio::process::Child, + futs: FuturesUnordered>>, +) -> Result { + let closed = process.wait(); pin!(closed); let r = tokio::select! { @@ -880,8 +1119,69 @@ where debug!( log, - "spawned command {} exited with code {}", params.command, r.exit_code + "spawned cli {} exited with code {}", command, r.exit_code ); Ok(r) } + +async fn spawn_do_child_authentication( + log: &log::Logger, + stdin: &mut ChildStdin, + stdout: &mut ChildStderr, +) -> Result<(), CodeError> { + let (msg_tx, msg_rx) = mpsc::unbounded_channel(); + let (shutdown_rx, shutdown) = new_barrier(); + let mut rpc = new_msgpack_rpc(); + let caller = rpc.get_caller(msg_tx); + + let challenge_response = do_challenge_response_flow(caller, shutdown); + let rpc = start_msgpack_rpc( + rpc.methods(()).build(log.prefixed("client-auth")), + stdout, + stdin, + msg_rx, + shutdown_rx, + ); + pin!(rpc); + + tokio::select! { + r = &mut rpc => { + match r { + // means shutdown happened cleanly already, we're good + Ok(_) => Ok(()), + Err(e) => Err(CodeError::ProcessSpawnHandshakeFailed(e)) + } + }, + r = challenge_response => { + r?; + rpc.await.map(|_| ()).map_err(CodeError::ProcessSpawnFailed) + } + } +} + +async fn do_challenge_response_flow( + caller: RpcCaller, + shutdown: BarrierOpener<()>, +) -> Result<(), CodeError> { + let challenge: ChallengeIssueResponse = caller + .call(METHOD_CHALLENGE_ISSUE, EmptyObject {}) + .await + .unwrap() + .map_err(CodeError::TunnelRpcCallFailed)?; + + let _: EmptyObject = caller + .call( + METHOD_CHALLENGE_VERIFY, + ChallengeVerifyParams { + response: sign_challenge(&challenge.challenge), + }, + ) + .await + .unwrap() + .map_err(CodeError::TunnelRpcCallFailed)?; + + shutdown.open(()); + + Ok(()) +} diff --git a/cli/src/tunnels/dev_tunnels.rs b/cli/src/tunnels/dev_tunnels.rs index 45ba6f9860a..3bdc5cf189b 100644 --- a/cli/src/tunnels/dev_tunnels.rs +++ b/cli/src/tunnels/dev_tunnels.rs @@ -3,13 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ use crate::auth; -use crate::constants::{ - CONTROL_PORT, IS_INTERACTIVE_CLI, PROTOCOL_VERSION_TAG, PROTOCOL_VERSION_TAG_PREFIX, - TUNNEL_SERVICE_USER_AGENT, -}; +use crate::constants::{IS_INTERACTIVE_CLI, PROTOCOL_VERSION_TAG, TUNNEL_SERVICE_USER_AGENT}; use crate::state::{LauncherPaths, PersistedState}; use crate::util::errors::{ - wrap, AnyError, DevTunnelError, InvalidTunnelName, TunnelCreationFailed, WrappedError, + wrap, AnyError, CodeError, DevTunnelError, InvalidTunnelName, TunnelCreationFailed, + WrappedError, }; use crate::util::input::prompt_placeholder; use crate::{debug, info, log, spanf, trace, warning}; @@ -32,6 +30,10 @@ use tunnels::management::{ NO_REQUEST_OPTIONS, }; +use super::wsl_detect::is_wsl_installed; + +static TUNNEL_COUNT_LIMIT_NAME: &str = "TunnelsPerUserPerLocation"; + #[derive(Clone, Serialize, Deserialize)] pub struct PersistedTunnel { pub name: String, @@ -133,6 +135,7 @@ pub struct DevTunnels { log: log::Logger, launcher_tunnel: PersistedState>, client: TunnelManagementClient, + tag: &'static str, } /// Representation of a tunnel returned from the `start` methods. @@ -161,30 +164,43 @@ impl ActiveTunnel { } /// Forwards a port over TCP. - pub async fn add_port_tcp(&mut self, port_number: u16) -> Result<(), AnyError> { + pub async fn add_port_tcp(&self, port_number: u16) -> Result<(), AnyError> { self.manager.add_port_tcp(port_number).await?; Ok(()) } /// Removes a forwarded port TCP. - pub async fn remove_port(&mut self, port_number: u16) -> Result<(), AnyError> { + pub async fn remove_port(&self, port_number: u16) -> Result<(), AnyError> { self.manager.remove_port(port_number).await?; Ok(()) } - /// Gets the public URI on which a forwarded port can be access in browser. - pub async fn get_port_uri(&mut self, port: u16) -> Result { - let endpoint = self.manager.get_endpoint().await?; - let format = endpoint - .base - .port_uri_format - .expect("expected to have port format"); + /// Gets the template string for forming forwarded port web URIs.. + pub fn get_port_format(&self) -> Result { + if let Some(details) = &*self.manager.endpoint_rx.borrow() { + return details + .as_ref() + .map(|r| { + r.base + .port_uri_format + .clone() + .expect("expected to have port format") + }) + .map_err(|e| e.clone().into()); + } - Ok(format.replace(PORT_TOKEN, &port.to_string())) + Err(CodeError::NoTunnelEndpoint.into()) + } + + /// Gets the public URI on which a forwarded port can be access in browser. + pub fn get_port_uri(&self, port: u16) -> Result { + self.get_port_format() + .map(|f| f.replace(PORT_TOKEN, &port.to_string())) } } const VSCODE_CLI_TUNNEL_TAG: &str = "vscode-server-launcher"; +const VSCODE_CLI_FORWARDING_TAG: &str = "vscode-port-forward"; const MAX_TUNNEL_NAME_LENGTH: usize = 20; fn get_host_token_from_tunnel(tunnel: &Tunnel) -> String { @@ -228,7 +244,7 @@ lazy_static! { #[derive(Clone, Debug)] pub struct ExistingTunnel { /// Name you'd like to assign preexisting tunnel to use to connect to the VS Code Server - pub tunnel_name: String, + pub tunnel_name: Option, /// Token to authenticate and use preexisting tunnel pub host_token: String, @@ -241,7 +257,29 @@ pub struct ExistingTunnel { } impl DevTunnels { - pub fn new(log: &log::Logger, auth: auth::Auth, paths: &LauncherPaths) -> DevTunnels { + /// Creates a new DevTunnels client used for port forwarding. + pub fn new_port_forwarding( + log: &log::Logger, + auth: auth::Auth, + paths: &LauncherPaths, + ) -> DevTunnels { + let mut client = new_tunnel_management(&TUNNEL_SERVICE_USER_AGENT); + client.authorization_provider(auth); + + DevTunnels { + log: log.clone(), + client: client.into(), + launcher_tunnel: PersistedState::new(paths.root().join("port_forwarding_tunnel.json")), + tag: VSCODE_CLI_FORWARDING_TAG, + } + } + + /// Creates a new DevTunnels client used for the Remote Tunnels extension to access the VS Code Server. + pub fn new_remote_tunnel( + log: &log::Logger, + auth: auth::Auth, + paths: &LauncherPaths, + ) -> DevTunnels { let mut client = new_tunnel_management(&TUNNEL_SERVICE_USER_AGENT); client.authorization_provider(auth); @@ -249,6 +287,7 @@ impl DevTunnels { log: log.clone(), client: client.into(), launcher_tunnel: PersistedState::new(paths.root().join("code_tunnel.json")), + tag: VSCODE_CLI_TUNNEL_TAG, } } @@ -274,7 +313,9 @@ impl DevTunnels { /// Renames the current tunnel to the new name. pub async fn rename_tunnel(&mut self, name: &str) -> Result<(), AnyError> { - self.update_tunnel_name(None, name).await.map(|_| ()) + self.update_tunnel_name(self.launcher_tunnel.load(), name) + .await + .map(|_| ()) } /// Updates the name of the existing persisted tunnel to the new name. @@ -285,28 +326,34 @@ impl DevTunnels { name: &str, ) -> Result<(Tunnel, PersistedTunnel), AnyError> { let name = name.to_ascii_lowercase(); - self.check_is_name_free(&name).await?; - - debug!(self.log, "Tunnel name changed, applying updates..."); let (mut full_tunnel, mut persisted, is_new) = match persisted { Some(persisted) => { + debug!( + self.log, + "Found a persisted tunnel, seeing if the name matches..." + ); self.get_or_create_tunnel(persisted, Some(&name), NO_REQUEST_OPTIONS) .await } - None => self - .create_tunnel(&name, NO_REQUEST_OPTIONS) - .await - .map(|(pt, t)| (t, pt, true)), + None => { + debug!(self.log, "Creating a new tunnel with the requested name"); + self.create_tunnel(&name, NO_REQUEST_OPTIONS) + .await + .map(|(pt, t)| (t, pt, true)) + } }?; - if is_new { + let desired_tags = self.get_tags(&name); + if is_new || vec_eq_as_set(&full_tunnel.tags, &desired_tags) { return Ok((full_tunnel, persisted)); } - full_tunnel.tags = vec![name.to_string(), VSCODE_CLI_TUNNEL_TAG.to_string()]; + debug!(self.log, "Tunnel name changed, applying updates..."); - let new_tunnel = spanf!( + full_tunnel.tags = desired_tags; + + let updated_tunnel = spanf!( self.log, self.log.span("dev-tunnel.tag.update"), self.client.update_tunnel(&full_tunnel, NO_REQUEST_OPTIONS) @@ -316,7 +363,7 @@ impl DevTunnels { persisted.name = name; self.launcher_tunnel.save(Some(persisted.clone()))?; - Ok((new_tunnel, persisted)) + Ok((updated_tunnel, persisted)) } /// Gets the persisted tunnel from the service, or creates a new one. @@ -355,6 +402,7 @@ impl DevTunnels { &mut self, preferred_name: Option<&str>, use_random_name: bool, + preserve_ports: &[u16], ) -> Result { let (mut tunnel, persisted) = match self.launcher_tunnel.load() { Some(mut persisted) => { @@ -383,11 +431,14 @@ impl DevTunnels { } }; - if !tunnel.tags.iter().any(|t| t == PROTOCOL_VERSION_TAG) { - tunnel = self - .update_protocol_version_tag(tunnel, &HOST_TUNNEL_REQUEST_OPTIONS) - .await?; - } + tunnel = self + .sync_tunnel_tags( + &self.client, + &persisted.name, + tunnel, + &HOST_TUNNEL_REQUEST_OPTIONS, + ) + .await?; let locator = TunnelLocator::try_from(&tunnel).unwrap(); let host_token = get_host_token_from_tunnel(&tunnel); @@ -395,7 +446,7 @@ impl DevTunnels { for port_to_delete in tunnel .ports .iter() - .filter(|p| p.port_number != CONTROL_PORT) + .filter(|p: &&TunnelPort| !preserve_ports.contains(&p.port_number)) { let output_fut = self.client.delete_tunnel_port( &locator, @@ -444,14 +495,10 @@ impl DevTunnels { ) -> Result<(PersistedTunnel, Tunnel), AnyError> { info!(self.log, "Creating tunnel with the name: {}", name); - let mut tried_recycle = false; + self.check_is_name_free(name).await?; let new_tunnel = Tunnel { - tags: vec![ - name.to_string(), - PROTOCOL_VERSION_TAG.to_string(), - VSCODE_CLI_TUNNEL_TAG.to_string(), - ], + tags: self.get_tags(name), ..Default::default() }; @@ -466,14 +513,23 @@ impl DevTunnels { Err(HttpError::ResponseError(e)) if e.status_code == StatusCode::TOO_MANY_REQUESTS => { - if !tried_recycle && self.try_recycle_tunnel().await? { - tried_recycle = true; - continue; + if let Some(d) = e.get_details() { + let detail = d.detail.unwrap_or_else(|| "unknown".to_string()); + if detail.contains(TUNNEL_COUNT_LIMIT_NAME) + && self.try_recycle_tunnel().await? + { + continue; + } + + return Err(AnyError::from(TunnelCreationFailed( + name.to_string(), + detail, + ))); } return Err(AnyError::from(TunnelCreationFailed( name.to_string(), - "You've exceeded the 10 machine limit for the port fowarding service. Please remove other machines before trying to add this machine.".to_string(), + "You have exceeded a limit for the port fowarding service. Please remove other machines before trying to add this machine.".to_string(), ))); } Err(e) => { @@ -496,23 +552,41 @@ impl DevTunnels { } } + /// Gets the expected tunnel tags + fn get_tags(&self, name: &str) -> Vec { + let mut tags = vec![ + name.to_string(), + PROTOCOL_VERSION_TAG.to_string(), + self.tag.to_string(), + ]; + + if is_wsl_installed(&self.log) { + tags.push("_wsl".to_string()) + } + + tags + } + /// Ensures the tunnel contains a tag for the current PROTCOL_VERSION, and no /// other version tags. - async fn update_protocol_version_tag( + async fn sync_tunnel_tags( &self, + client: &TunnelManagementClient, + name: &str, tunnel: Tunnel, options: &TunnelRequestOptions, ) -> Result { + let new_tags = self.get_tags(name); + if vec_eq_as_set(&tunnel.tags, &new_tags) { + return Ok(tunnel); + } + debug!( self.log, - "Updating tunnel protocol version tag to {}", PROTOCOL_VERSION_TAG + "Updating tunnel tags {} -> {}", + tunnel.tags.join(", "), + new_tags.join(", ") ); - let mut new_tags: Vec = tunnel - .tags - .into_iter() - .filter(|t| !t.starts_with(PROTOCOL_VERSION_TAG_PREFIX)) - .collect(); - new_tags.push(PROTOCOL_VERSION_TAG.to_string()); let tunnel_update = Tunnel { tags: new_tags, @@ -524,7 +598,7 @@ impl DevTunnels { let result = spanf!( self.log, self.log.span("dev-tunnel.protocol-tag-update"), - self.client.update_tunnel(&tunnel_update, options) + client.update_tunnel(&tunnel_update, options) ); result.map_err(|e| wrap(e, "tunnel tag update failed").into()) @@ -575,7 +649,7 @@ impl DevTunnels { self.log, self.log.span("dev-tunnel.listall"), self.client.list_all_tunnels(&TunnelRequestOptions { - tags: vec![VSCODE_CLI_TUNNEL_TAG.to_string()], + tags: vec![self.tag.to_string()], require_all_tags: true, ..Default::default() }) @@ -586,11 +660,11 @@ impl DevTunnels { } async fn check_is_name_free(&mut self, name: &str) -> Result<(), AnyError> { - let existing = spanf!( + let existing: Vec = spanf!( self.log, self.log.span("dev-tunnel.rename.search"), self.client.list_all_tunnels(&TunnelRequestOptions { - tags: vec![VSCODE_CLI_TUNNEL_TAG.to_string(), name.to_string()], + tags: vec![self.tag.to_string(), name.to_string()], require_all_tags: true, ..Default::default() }) @@ -605,6 +679,12 @@ impl DevTunnels { Ok(()) } + fn get_placeholder_name() -> String { + let mut n = clean_hostname_for_tunnel(&gethostname::gethostname().to_string_lossy()); + n.make_ascii_lowercase(); + n + } + async fn get_name_for_tunnel( &mut self, preferred_name: Option<&str>, @@ -636,10 +716,7 @@ impl DevTunnels { use_random_name = true; } - let mut placeholder_name = - clean_hostname_for_tunnel(&gethostname::gethostname().to_string_lossy()); - placeholder_name.make_ascii_lowercase(); - + let mut placeholder_name = Self::get_placeholder_name(); if !is_name_free(&placeholder_name) { for i in 2.. { let fixed_name = format!("{}{}", placeholder_name, i); @@ -681,7 +758,10 @@ impl DevTunnels { tunnel: ExistingTunnel, ) -> Result { let tunnel_details = PersistedTunnel { - name: tunnel.tunnel_name, + name: match tunnel.tunnel_name { + Some(n) => n, + None => Self::get_placeholder_name(), + }, id: tunnel.tunnel_id, cluster: tunnel.cluster, }; @@ -691,10 +771,23 @@ impl DevTunnels { tunnel.host_token.clone(), )); + let client = mgmt.into(); + self.sync_tunnel_tags( + &client, + &tunnel_details.name, + Tunnel { + cluster_id: Some(tunnel_details.cluster.clone()), + tunnel_id: Some(tunnel_details.id.clone()), + ..Default::default() + }, + &HOST_TUNNEL_REQUEST_OPTIONS, + ) + .await?; + self.start_tunnel( tunnel_details.locator(), &tunnel_details, - mgmt.into(), + client, StaticAccessTokenProvider::new(tunnel.host_token), ) .await @@ -974,6 +1067,20 @@ fn clean_hostname_for_tunnel(hostname: &str) -> String { } } +fn vec_eq_as_set(a: &[String], b: &[String]) -> bool { + if a.len() != b.len() { + return false; + } + + for item in a { + if !b.contains(item) { + return false; + } + } + + true +} + #[cfg(test)] mod test { use super::*; diff --git a/cli/src/tunnels/forwarding.rs b/cli/src/tunnels/forwarding.rs new file mode 100644 index 00000000000..1557b97c04e --- /dev/null +++ b/cli/src/tunnels/forwarding.rs @@ -0,0 +1,284 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::{ + collections::HashMap, + sync::{Arc, Mutex}, +}; + +use tokio::{ + pin, + sync::{mpsc, watch}, +}; + +use crate::{ + async_pipe::{socket_stream_split, AsyncPipe}, + json_rpc::{new_json_rpc, start_json_rpc}, + log, + singleton::SingletonServer, + util::{errors::CodeError, sync::Barrier}, +}; + +use super::{ + dev_tunnels::ActiveTunnel, + protocol::{ + self, + forward_singleton::{PortList, SetPortsResponse}, + }, + shutdown_signal::ShutdownSignal, +}; + +type PortMap = HashMap; + +/// The PortForwardingHandle is given out to multiple consumers to allow +/// them to set_ports that they want to be forwarded. +struct PortForwardingSender { + /// Todo: when `SyncUnsafeCell` is no longer nightly, we can use it here with + /// the following comment: + /// + /// SyncUnsafeCell is used and safe here because PortForwardingSender is used + /// exclusively in synchronous dispatch *and* we create a new sender in the + /// context for each connection, in `serve_singleton_rpc`. + /// + /// If PortForwardingSender is ever used in a different context, this should + /// be refactored, e.g. to use locks or `&mut self` in set_ports` + /// + /// see https://doc.rust-lang.org/stable/std/cell/struct.SyncUnsafeCell.html + current: Mutex, + sender: Arc>>, +} + +impl PortForwardingSender { + pub fn set_ports(&self, ports: PortList) { + let mut current = self.current.lock().unwrap(); + self.sender.lock().unwrap().send_modify(|v| { + for p in current.iter() { + if !ports.contains(p) { + match v.get(p) { + Some(1) => { + v.remove(p); + } + Some(n) => { + v.insert(*p, n - 1); + } + None => unreachable!("removed port not in map"), + } + } + } + + for p in ports.iter() { + if !current.contains(p) { + match v.get(p) { + Some(n) => v.insert(*p, n + 1), + None => v.insert(*p, 1), + }; + } + } + + current.splice(.., ports); + }); + } +} + +impl Clone for PortForwardingSender { + fn clone(&self) -> Self { + Self { + current: Mutex::new(vec![]), + sender: self.sender.clone(), + } + } +} + +impl Drop for PortForwardingSender { + fn drop(&mut self) { + self.set_ports(vec![]); + } +} + +struct PortForwardingReceiver { + receiver: watch::Receiver, +} + +impl PortForwardingReceiver { + pub fn new() -> (PortForwardingSender, Self) { + let (sender, receiver) = watch::channel(HashMap::new()); + let handle = PortForwardingSender { + current: Mutex::new(vec![]), + sender: Arc::new(Mutex::new(sender)), + }; + + let tracker = Self { receiver }; + + (handle, tracker) + } + + /// Applies all changes from PortForwardingHandles to the tunnel. + pub async fn apply_to(&mut self, log: log::Logger, tunnel: Arc) { + let mut current = vec![]; + while self.receiver.changed().await.is_ok() { + let next = self.receiver.borrow().keys().copied().collect::>(); + + for p in current.iter() { + if !next.contains(p) { + match tunnel.remove_port(*p).await { + Ok(_) => info!(log, "stopped forwarding port {}", p), + Err(e) => error!(log, "failed to stop forwarding port {}: {}", p, e), + } + } + } + for p in next.iter() { + if !current.contains(p) { + match tunnel.add_port_tcp(*p).await { + Ok(_) => info!(log, "forwarding port {}", p), + Err(e) => error!(log, "failed to forward port {}: {}", p, e), + } + } + } + + current = next; + } + } +} + +pub struct SingletonClientArgs { + pub log: log::Logger, + pub stream: AsyncPipe, + pub shutdown: Barrier, + pub port_requests: watch::Receiver, +} + +#[derive(Clone)] +struct SingletonServerContext { + log: log::Logger, + handle: PortForwardingSender, + tunnel: Arc, +} + +/// Serves a client singleton for port forwarding. +pub async fn client(args: SingletonClientArgs) -> Result<(), std::io::Error> { + let mut rpc = new_json_rpc(); + let (msg_tx, msg_rx) = mpsc::unbounded_channel(); + let SingletonClientArgs { + log, + shutdown, + stream, + mut port_requests, + } = args; + + debug!( + log, + "An existing port forwarding process is running on this machine, connecting to it..." + ); + + let caller = rpc.get_caller(msg_tx); + let rpc = rpc.methods(()).build(log.clone()); + let (read, write) = socket_stream_split(stream); + + let serve = start_json_rpc(rpc, read, write, msg_rx, shutdown); + let forward = async move { + while port_requests.changed().await.is_ok() { + let ports = port_requests.borrow().clone(); + let r = caller + .call::<_, _, protocol::forward_singleton::SetPortsResponse>( + protocol::forward_singleton::METHOD_SET_PORTS, + protocol::forward_singleton::SetPortsParams { ports }, + ) + .await + .unwrap(); + + match r { + Err(e) => error!(log, "failed to set ports: {:?}", e), + Ok(r) => print_forwarding_addr(&r), + }; + } + }; + + tokio::select! { + r = serve => r.map(|_| ()), + _ = forward => Ok(()), + } +} + +/// Serves a port-forwarding singleton. +pub async fn server( + log: log::Logger, + tunnel: ActiveTunnel, + server: SingletonServer, + mut port_requests: watch::Receiver, + shutdown_rx: Barrier, +) -> Result<(), CodeError> { + let tunnel = Arc::new(tunnel); + let (forward_tx, mut forward_rx) = PortForwardingReceiver::new(); + + let forward_own_tunnel = tunnel.clone(); + let forward_own_tx = forward_tx.clone(); + let forward_own = async move { + while port_requests.changed().await.is_ok() { + forward_own_tx.set_ports(port_requests.borrow().clone()); + print_forwarding_addr(&SetPortsResponse { + port_format: forward_own_tunnel.get_port_format().ok(), + }); + } + }; + + tokio::select! { + _ = forward_own => Ok(()), + _ = forward_rx.apply_to(log.clone(), tunnel.clone()) => Ok(()), + r = serve_singleton_rpc(server, log, tunnel, forward_tx, shutdown_rx) => r, + } +} + +async fn serve_singleton_rpc( + mut server: SingletonServer, + log: log::Logger, + tunnel: Arc, + forward_tx: PortForwardingSender, + shutdown_rx: Barrier, +) -> Result<(), CodeError> { + let mut own_shutdown = shutdown_rx.clone(); + let shutdown_fut = own_shutdown.wait(); + pin!(shutdown_fut); + + loop { + let cnx = tokio::select! { + c = server.accept() => c?, + _ = &mut shutdown_fut => return Ok(()), + }; + + let (read, write) = socket_stream_split(cnx); + let shutdown_rx = shutdown_rx.clone(); + + let handle = forward_tx.clone(); + let log = log.clone(); + let tunnel = tunnel.clone(); + tokio::spawn(async move { + // we make an rpc for the connection instead of re-using a dispatcher + // so that we can have the "handle" drop when the connection drops. + let rpc = new_json_rpc(); + let mut rpc = rpc.methods(SingletonServerContext { + log: log.clone(), + handle, + tunnel, + }); + + rpc.register_sync( + protocol::forward_singleton::METHOD_SET_PORTS, + |p: protocol::forward_singleton::SetPortsParams, ctx| { + info!(ctx.log, "client setting ports to {:?}", p.ports); + ctx.handle.set_ports(p.ports); + Ok(SetPortsResponse { + port_format: ctx.tunnel.get_port_format().ok(), + }) + }, + ); + + let _ = start_json_rpc(rpc.build(log), read, write, (), shutdown_rx).await; + }); + } +} + +fn print_forwarding_addr(r: &SetPortsResponse) { + eprintln!("{}\n", serde_json::to_string(r).unwrap()); +} diff --git a/cli/src/tunnels/paths.rs b/cli/src/tunnels/paths.rs index fa06db5dd7a..a0cd43cd83c 100644 --- a/cli/src/tunnels/paths.rs +++ b/cli/src/tunnels/paths.rs @@ -91,10 +91,15 @@ impl InstalledServer { pub fn server_paths(&self, p: &LauncherPaths) -> ServerPaths { let server_dir = self.get_install_folder(p); ServerPaths { - executable: server_dir - .join(SERVER_FOLDER_NAME) - .join("bin") - .join(self.quality.server_entrypoint()), + // allow using the OSS server in development via an override + executable: if let Some(p) = option_env!("VSCODE_CLI_OVERRIDE_SERVER_PATH") { + PathBuf::from(p) + } else { + server_dir + .join(SERVER_FOLDER_NAME) + .join("bin") + .join(self.quality.server_entrypoint()) + }, logfile: server_dir.join("log.txt"), pidfile: server_dir.join("pid.txt"), server_dir, diff --git a/cli/src/tunnels/port_forwarder.rs b/cli/src/tunnels/port_forwarder.rs index bb60a670dea..0f489f541d7 100644 --- a/cli/src/tunnels/port_forwarder.rs +++ b/cli/src/tunnels/port_forwarder.rs @@ -91,7 +91,7 @@ impl PortForwardingProcessor { self.forwarded.insert(port); } - tunnel.get_port_uri(port).await + tunnel.get_port_uri(port) } } diff --git a/cli/src/tunnels/protocol.rs b/cli/src/tunnels/protocol.rs index 17282381c55..cf01917ee1e 100644 --- a/cli/src/tunnels/protocol.rs +++ b/cli/src/tunnels/protocol.rs @@ -18,7 +18,7 @@ pub enum ClientRequestMethod<'a> { servermsg(RefServerMessageParams<'a>), serverlog(ServerLog<'a>), makehttpreq(HttpRequestParams<'a>), - version(VersionParams), + version(VersionResponse), } #[derive(Deserialize, Debug)] @@ -58,14 +58,6 @@ pub struct ForwardResult { pub uri: String, } -/// The `install_local` method in the wsl control server -#[derive(Deserialize, Debug)] -pub struct InstallFromLocalFolderParams { - pub archive_path: String, - #[serde(flatten)] - pub inner: ServeParams, -} - #[derive(Deserialize, Debug)] pub struct ServeParams { pub socket_id: u16, @@ -165,12 +157,12 @@ pub struct CallServerHttpResult { } #[derive(Serialize, Debug)] -pub struct VersionParams { +pub struct VersionResponse { pub version: &'static str, pub protocol_version: u32, } -impl Default for VersionParams { +impl Default for VersionResponse { fn default() -> Self { Self { version: VSCODE_CLI_VERSION.unwrap_or("dev"), @@ -204,6 +196,42 @@ pub struct SpawnResult { pub exit_code: i32, } +pub const METHOD_CHALLENGE_ISSUE: &str = "challenge_issue"; +pub const METHOD_CHALLENGE_VERIFY: &str = "challenge_verify"; + +#[derive(Serialize, Deserialize)] +pub struct ChallengeIssueParams { + pub token: Option, +} + +#[derive(Serialize, Deserialize)] +pub struct ChallengeIssueResponse { + pub challenge: String, +} + +#[derive(Deserialize, Serialize)] +pub struct ChallengeVerifyParams { + pub response: String, +} + +pub mod forward_singleton { + use serde::{Deserialize, Serialize}; + + pub const METHOD_SET_PORTS: &str = "set_ports"; + + pub type PortList = Vec; + + #[derive(Serialize, Deserialize)] + pub struct SetPortsParams { + pub ports: PortList, + } + + #[derive(Serialize, Deserialize)] + pub struct SetPortsResponse { + pub port_format: Option, + } +} + pub mod singleton { use crate::log; use serde::{Deserialize, Serialize}; diff --git a/cli/src/tunnels/server_multiplexer.rs b/cli/src/tunnels/server_multiplexer.rs index 34782ff375b..65eb1df7ad5 100644 --- a/cli/src/tunnels/server_multiplexer.rs +++ b/cli/src/tunnels/server_multiplexer.rs @@ -105,7 +105,7 @@ impl ServerMultiplexer { } } -/// Write loop started by `handle_server_message`. It take sthe ServerBridge, and +/// Write loop started by `handle_server_message`. It takes the ServerBridge, and /// runs until there's no more items in the 'write queue'. At that point, if the /// record still exists in the bridges_lock (i.e. we haven't shut down), it'll /// return the ServerBridge so that the next handle_server_message call starts diff --git a/cli/src/tunnels/service.rs b/cli/src/tunnels/service.rs index 31bf6890996..dba68f3b614 100644 --- a/cli/src/tunnels/service.rs +++ b/cli/src/tunnels/service.rs @@ -41,6 +41,9 @@ pub trait ServiceManager { /// Show logs from the running service to standard out. async fn show_logs(&self) -> Result<(), AnyError>; + /// Gets whether the tunnel service is installed. + async fn is_installed(&self) -> Result; + /// Unregisters the current executable as a service. async fn unregister(&self) -> Result<(), AnyError>; } diff --git a/cli/src/tunnels/service_linux.rs b/cli/src/tunnels/service_linux.rs index 725b72a8d6d..b60d114dc46 100644 --- a/cli/src/tunnels/service_linux.rs +++ b/cli/src/tunnels/service_linux.rs @@ -17,7 +17,7 @@ use crate::{ constants::{APPLICATION_NAME, PRODUCT_NAME_LONG}, log, state::LauncherPaths, - util::errors::{wrap, AnyError}, + util::errors::{wrap, AnyError, DbusConnectFailedError}, }; use super::ServiceManager; @@ -40,7 +40,7 @@ impl SystemdService { async fn connect() -> Result { let connection = Connection::session() .await - .map_err(|e| wrap(e, "error creating dbus session"))?; + .map_err(|e| DbusConnectFailedError(e.to_string()))?; Ok(connection) } @@ -110,9 +110,27 @@ impl ServiceManager for SystemdService { info!(self.log, "Tunnel service successfully started"); + if std::env::var("SSH_CLIENT").is_ok() || std::env::var("SSH_TTY").is_ok() { + info!(self.log, "Tip: run `sudo loginctl enable-linger $USER` to ensure the service stays running after you disconnect."); + } + Ok(()) } + async fn is_installed(&self) -> Result { + let connection = SystemdService::connect().await?; + let proxy = SystemdService::proxy(&connection).await?; + let state = proxy + .get_unit_file_state(SystemdService::service_name_string()) + .await; + + if let Ok(s) = state { + Ok(s == "enabled") + } else { + Ok(false) + } + } + async fn run( self, launcher_paths: crate::state::LauncherPaths, @@ -219,6 +237,8 @@ trait SystemdManagerDbus { force: bool, ) -> zbus::Result<(bool, Vec<(String, String, String)>)>; + fn get_unit_file_state(&self, file: String) -> zbus::Result; + fn link_unit_files( &self, files: Vec, diff --git a/cli/src/tunnels/service_macos.rs b/cli/src/tunnels/service_macos.rs index dcc676ffce5..2d0a23f8cb2 100644 --- a/cli/src/tunnels/service_macos.rs +++ b/cli/src/tunnels/service_macos.rs @@ -75,6 +75,11 @@ impl ServiceManager for LaunchdService { handle.run_service(self.log, launcher_paths).await } + async fn is_installed(&self) -> Result { + let cmd = capture_command_and_check_status("launchctl", &["list"]).await?; + Ok(String::from_utf8_lossy(&cmd.stdout).contains(&get_service_label())) + } + async fn unregister(&self) -> Result<(), crate::util::errors::AnyError> { let service_file = get_service_file_path()?; diff --git a/cli/src/tunnels/service_windows.rs b/cli/src/tunnels/service_windows.rs index d597960af3e..3d2dc9f0c55 100644 --- a/cli/src/tunnels/service_windows.rs +++ b/cli/src/tunnels/service_windows.rs @@ -5,10 +5,12 @@ use async_trait::async_trait; use shell_escape::windows::escape as shell_escape; +use std::os::windows::process::CommandExt; use std::{ path::PathBuf, process::{Command, Stdio}, }; +use winapi::um::winbase::{CREATE_NEW_PROCESS_GROUP, DETACHED_PROCESS}; use winreg::{enums::HKEY_CURRENT_USER, RegKey}; use crate::{ @@ -21,6 +23,8 @@ use crate::{ use super::service::{tail_log_file, ServiceContainer, ServiceManager as CliServiceManager}; +const DID_LAUNCH_AS_HIDDEN_PROCESS: &str = "VSCODE_CLI_DID_LAUNCH_AS_HIDDEN_PROCESS"; + pub struct WindowsService { log: log::Logger, tunnel_lock: PathBuf, @@ -74,6 +78,7 @@ impl CliServiceManager for WindowsService { cmd.stderr(Stdio::null()); cmd.stdout(Stdio::null()); cmd.stdin(Stdio::null()); + cmd.creation_flags(CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS); cmd.spawn() .map_err(|e| wrapdbg(e, "error starting service"))?; @@ -90,13 +95,39 @@ impl CliServiceManager for WindowsService { launcher_paths: LauncherPaths, mut handle: impl 'static + ServiceContainer, ) -> Result<(), AnyError> { - handle.run_service(self.log, launcher_paths).await + if std::env::var(DID_LAUNCH_AS_HIDDEN_PROCESS).is_ok() { + return handle.run_service(self.log, launcher_paths).await; + } + + // Start as a hidden subprocess to avoid showing cmd.exe on startup. + // Fixes https://github.com/microsoft/vscode/issues/184058 + // I also tried the winapi ShowWindow, but that didn't yield fruit. + Command::new(std::env::current_exe().unwrap()) + .args(std::env::args().skip(1)) + .env(DID_LAUNCH_AS_HIDDEN_PROCESS, "1") + .stderr(Stdio::null()) + .stdout(Stdio::null()) + .stdin(Stdio::null()) + .creation_flags(CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS) + .spawn() + .map_err(|e| wrap(e, "error starting nested process"))?; + + Ok(()) + } + + async fn is_installed(&self) -> Result { + let key = WindowsService::open_key()?; + Ok(key.get_raw_value(TUNNEL_ACTIVITY_NAME).is_ok()) } async fn unregister(&self) -> Result<(), AnyError> { let key = WindowsService::open_key()?; - key.delete_value(TUNNEL_ACTIVITY_NAME) - .map_err(|e| AnyError::from(wrap(e, "error deleting registry key")))?; + match key.delete_value(TUNNEL_ACTIVITY_NAME) { + Ok(_) => {} + Err(e) if e.kind() == std::io::ErrorKind::NotFound => {} + Err(e) => return Err(wrap(e, "error deleting registry key").into()), + } + info!(self.log, "Tunnel service uninstalled"); let r = do_single_rpc_call::<_, ()>( diff --git a/cli/src/tunnels/singleton_client.rs b/cli/src/tunnels/singleton_client.rs index b67a53306d1..ef9fdf85cc0 100644 --- a/cli/src/tunnels/singleton_client.rs +++ b/cli/src/tunnels/singleton_client.rs @@ -74,7 +74,6 @@ pub async fn start_singleton_client(args: SingletonClientArgs) -> bool { let mut input = String::new(); loop { input.truncate(0); - println!("reading line"); match std::io::stdin().read_line(&mut input) { Err(_) | Ok(0) => return, // EOF or not a tty _ => {} diff --git a/cli/src/tunnels/singleton_server.rs b/cli/src/tunnels/singleton_server.rs index 703c09f5120..77cc701ca46 100644 --- a/cli/src/tunnels/singleton_server.rs +++ b/cli/src/tunnels/singleton_server.rs @@ -217,7 +217,7 @@ impl BroadcastLogSink { } } - fn get_brocaster(&self) -> broadcast::Sender> { + pub fn get_brocaster(&self) -> broadcast::Sender> { self.tx.clone() } diff --git a/cli/src/tunnels/socket_signal.rs b/cli/src/tunnels/socket_signal.rs index a3d3b08a5d4..2a2df6607ea 100644 --- a/cli/src/tunnels/socket_signal.rs +++ b/cli/src/tunnels/socket_signal.rs @@ -38,6 +38,7 @@ impl SocketSignal { } /// todo@connor4312: cleanup once everything is moved to rpc standard interfaces +#[allow(dead_code)] pub enum ServerMessageDestination { Channel(mpsc::Sender), Rpc(MsgPackCaller), diff --git a/cli/src/tunnels/wsl_detect.rs b/cli/src/tunnels/wsl_detect.rs new file mode 100644 index 00000000000..ec386feb26e --- /dev/null +++ b/cli/src/tunnels/wsl_detect.rs @@ -0,0 +1,51 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use crate::log; + +#[cfg(not(windows))] +pub fn is_wsl_installed(_log: &log::Logger) -> bool { + false +} + +#[cfg(windows)] +pub fn is_wsl_installed(log: &log::Logger) -> bool { + use std::{path::PathBuf, process::Command}; + + let system32 = { + let sys_root = match std::env::var("SystemRoot") { + Ok(s) => s, + Err(_) => return false, + }; + + let is_32_on_64 = std::env::var("PROCESSOR_ARCHITEW6432").is_ok(); + let mut system32 = PathBuf::from(sys_root); + system32.push(if is_32_on_64 { "Sysnative" } else { "System32" }); + system32 + }; + + // Windows builds < 22000 + let mut maybe_lxss = system32.join("lxss"); + maybe_lxss.push("LxssManager.dll"); + if maybe_lxss.exists() { + trace!(log, "wsl availability detected via lxss"); + return true; + } + + // Windows builds >= 22000 + let maybe_wsl = system32.join("wsl.exe"); + if maybe_wsl.exists() { + if let Ok(s) = Command::new(maybe_wsl).arg("--status").output() { + if s.status.success() { + trace!(log, "wsl availability detected via subprocess"); + return true; + } + } + } + + trace!(log, "wsl not detected"); + + false +} diff --git a/cli/src/tunnels/wsl_server.rs b/cli/src/tunnels/wsl_server.rs deleted file mode 100644 index 3eafae92f3a..00000000000 --- a/cli/src/tunnels/wsl_server.rs +++ /dev/null @@ -1,173 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -use std::sync::Arc; - -use tokio::sync::mpsc; - -use crate::{ - log, - msgpack_rpc::{new_msgpack_rpc, start_msgpack_rpc, MsgPackCaller}, - state::LauncherPaths, - tunnels::code_server::ServerBuilder, - update_service::{Platform, Release, TargetKind}, - util::{ - errors::{ - wrap, AnyError, InvalidRpcDataError, MismatchedLaunchModeError, NoAttachedServerError, - }, - http::ReqwestSimpleHttp, - sync::Barrier, - }, -}; - -use super::{ - code_server::{AnyCodeServer, CodeServerArgs, ResolvedServerParams}, - protocol::{EmptyObject, InstallFromLocalFolderParams, ServerMessageParams, VersionParams}, - server_bridge::ServerBridge, - server_multiplexer::ServerMultiplexer, - shutdown_signal::ShutdownSignal, - socket_signal::{ClientMessageDecoder, ServerMessageDestination, ServerMessageSink}, -}; - -struct HandlerContext { - log: log::Logger, - code_server_args: CodeServerArgs, - launcher_paths: LauncherPaths, - platform: Platform, - http: ReqwestSimpleHttp, - caller: MsgPackCaller, - multiplexer: ServerMultiplexer, -} - -#[derive(Clone)] -struct RpcLogSink(MsgPackCaller); - -impl RpcLogSink { - fn write_json(&self, level: String, message: &str) { - self.0.notify( - "log", - serde_json::json!({ - "level": level, - "message": message, - }), - ); - } -} - -impl log::LogSink for RpcLogSink { - fn write_log(&self, level: log::Level, _prefix: &str, message: &str) { - self.write_json(level.to_string(), message); - } - - fn write_result(&self, message: &str) { - self.write_json("result".to_string(), message); - } -} - -pub async fn serve_wsl( - log: log::Logger, - launcher_paths: LauncherPaths, - code_server_args: CodeServerArgs, - platform: Platform, - http: reqwest::Client, - shutdown_rx: Barrier, -) -> Result { - let (caller_tx, caller_rx) = mpsc::unbounded_channel(); - let mut rpc = new_msgpack_rpc(); - let caller = rpc.get_caller(caller_tx); - - // notify the incoming client about the server version - caller.notify("version", VersionParams::default()); - - let log = log.with_sink(RpcLogSink(caller.clone())); - let mut rpc = rpc.methods(HandlerContext { - log: log.clone(), - caller, - code_server_args, - launcher_paths, - platform, - multiplexer: ServerMultiplexer::new(), - http: ReqwestSimpleHttp::with_client(http), - }); - - rpc.register_async( - "serve", - move |m: InstallFromLocalFolderParams, c| async move { handle_serve(&c, m).await }, - ); - rpc.register_sync("servermsg", move |m: ServerMessageParams, c| { - if c.multiplexer.write_message(&c.log, m.i, m.body) { - Ok(EmptyObject {}) - } else { - Err(NoAttachedServerError().into()) - } - }); - - start_msgpack_rpc( - rpc.build(log), - tokio::io::stdin(), - tokio::io::stderr(), - caller_rx, - shutdown_rx, - ) - .await - .map_err(|e| wrap(e, "error handling server stdio"))?; - - Ok(0) -} - -async fn handle_serve( - c: &HandlerContext, - params: InstallFromLocalFolderParams, -) -> Result { - // fill params.extensions into code_server_args.install_extensions - let mut csa = c.code_server_args.clone(); - csa.connection_token = params.inner.connection_token.or(csa.connection_token); - csa.install_extensions - .extend(params.inner.extensions.into_iter()); - - let resolved = ResolvedServerParams { - code_server_args: csa, - release: Release { - name: String::new(), - commit: params - .inner - .commit_id - .ok_or_else(|| InvalidRpcDataError("commit_id is required".to_string()))?, - platform: c.platform, - target: TargetKind::Server, - quality: params.inner.quality, - }, - }; - - let sb = ServerBuilder::new( - &c.log, - &resolved, - &c.launcher_paths, - Arc::new(c.http.clone()), - ); - let code_server = match sb.get_running().await? { - Some(AnyCodeServer::Socket(s)) => s, - Some(_) => return Err(MismatchedLaunchModeError().into()), - None => { - sb.setup().await?; - sb.listen_on_default_socket().await? - } - }; - - let bridge = ServerBridge::new( - &code_server.socket, - ServerMessageSink::new_plain( - c.multiplexer.clone(), - params.inner.socket_id, - ServerMessageDestination::Rpc(c.caller.clone()), - ), - ClientMessageDecoder::new_plain(), - ) - .await?; - - c.multiplexer.register(params.inner.socket_id, bridge); - trace!(c.log, "Attached to server"); - Ok(EmptyObject {}) -} diff --git a/cli/src/util/errors.rs b/cli/src/util/errors.rs index 9ab421d3301..c82e14acc8b 100644 --- a/cli/src/util/errors.rs +++ b/cli/src/util/errors.rs @@ -442,6 +442,26 @@ macro_rules! makeAnyError { }; } +#[derive(Debug)] +pub struct DbusConnectFailedError(pub String); + +impl Display for DbusConnectFailedError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + let mut str = String::new(); + str.push_str("Error creating dbus session. This command uses systemd for managing services, you should check that systemd is installed and under your user."); + + if std::env::var("WSL_DISTRO_NAME").is_ok() { + str.push_str("\n\nTo enable systemd on WSL, check out: https://devblogs.microsoft.com/commandline/systemd-support-is-now-available-in-wsl/.\n\n"); + } + + str.push_str("If running `systemctl status` works, systemd is ok, but your session dbus may not be. You might need to:\n\n- Install the `dbus-user-session` package, and reboot if it was not installed\n- Start the user dbus session with `systemctl --user enable dbus --now`.\n\nThe error encountered was: "); + str.push_str(&self.0); + str.push('\n'); + + write!(f, "{}", str) + } +} + /// Internal errors in the VS Code CLI. /// Note: other error should be migrated to this type gradually #[derive(Error, Debug)] @@ -479,9 +499,24 @@ pub enum CodeError { PrerequisitesFailed { name: &'static str, bullets: String }, #[error("failed to spawn process: {0:?}")] ProcessSpawnFailed(std::io::Error), - + #[error("failed to handshake spawned process: {0:?}")] + ProcessSpawnHandshakeFailed(std::io::Error), #[error("download appears corrupted, please retry ({0})")] CorruptDownload(&'static str), + #[error("port forwarding is not available in this context")] + PortForwardingNotAvailable, + #[error("'auth' call required")] + ServerAuthRequired, + #[error("challenge not yet issued")] + AuthChallengeNotIssued, + #[error("challenge token is invalid")] + AuthChallengeBadToken, + #[error("unauthorized client refused")] + AuthMismatch, + #[error("keyring communication timed out after 5s")] + KeyringTimeout, + #[error("no host is connected to the tunnel relay")] + NoTunnelEndpoint, } makeAnyError!( @@ -513,7 +548,8 @@ makeAnyError!( MissingHomeDirectory, OAuthError, InvalidRpcDataError, - CodeError + CodeError, + DbusConnectFailedError ); impl From for AnyError { diff --git a/cli/src/util/sync.rs b/cli/src/util/sync.rs index 2b506bd54e3..8b653cd2d53 100644 --- a/cli/src/util/sync.rs +++ b/cli/src/util/sync.rs @@ -4,11 +4,9 @@ *--------------------------------------------------------------------------------------------*/ use async_trait::async_trait; use std::{marker::PhantomData, sync::Arc}; -use tokio::{ - sync::{ - broadcast, mpsc, - watch::{self, error::RecvError}, - }, +use tokio::sync::{ + broadcast, mpsc, + watch::{self, error::RecvError}, }; #[derive(Clone)] diff --git a/cli/src/util/tar.rs b/cli/src/util/tar.rs index 77dd67abbb0..248f63f9720 100644 --- a/cli/src/util/tar.rs +++ b/cli/src/util/tar.rs @@ -6,7 +6,7 @@ use crate::util::errors::{wrap, WrappedError}; use flate2::read::GzDecoder; use std::fs; -use std::io::{Seek, SeekFrom}; +use std::io::Seek; use std::path::{Path, PathBuf}; use tar::Archive; @@ -65,7 +65,7 @@ where // reset since skip logic read the tar already: tar_gz - .seek(SeekFrom::Start(0)) + .rewind() .map_err(|e| wrap(e, "error resetting seek position"))?; let tar = GzDecoder::new(tar_gz); diff --git a/cli/src/util/zipper.rs b/cli/src/util/zipper.rs index 84eec040b0e..0e9939d4db5 100644 --- a/cli/src/util/zipper.rs +++ b/cli/src/util/zipper.rs @@ -88,8 +88,13 @@ where use std::io::Read; use std::os::unix::ffi::OsStringExt; - if matches!(file.unix_mode(), Some(mode) if mode & (S_IFLNK as u32) == (S_IFLNK as u32)) - { + #[cfg(target_os = "macos")] + const S_IFLINK_32: u32 = S_IFLNK as u32; + + #[cfg(target_os = "linux")] + const S_IFLINK_32: u32 = S_IFLNK; + + if matches!(file.unix_mode(), Some(mode) if mode & S_IFLINK_32 == S_IFLINK_32) { let mut link_to = Vec::new(); file.read_to_end(&mut link_to).map_err(|e| { wrap( diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json index 676e0b2f0f8..24c30e69af9 100644 --- a/extensions/configuration-editing/package.json +++ b/extensions/configuration-editing/package.json @@ -41,8 +41,7 @@ ".code-workspace", "language-configuration.json", "icon-theme.json", - "color-theme.json", - ".code-snippets" + "color-theme.json" ], "filenames": [ "settings.json", @@ -54,10 +53,6 @@ "profiles.json", "devcontainer.json", ".devcontainer.json" - ], - "filenamePatterns": [ - "**/User/snippets/*.json", - "**/User/profiles/*/snippets/*.json" ] }, { "id": "json", diff --git a/extensions/cpp/language-configuration.json b/extensions/cpp/language-configuration.json index 0f365702269..3a5459401f9 100644 --- a/extensions/cpp/language-configuration.json +++ b/extensions/cpp/language-configuration.json @@ -30,5 +30,16 @@ "start": "^\\s*#pragma\\s+region\\b", "end": "^\\s*#pragma\\s+endregion\\b" } - } + }, + "onEnterRules": [ + { + // Decrease indentation after single line if/else if/else, for, or while + "previousLineText": "^\\s*(((else ?)?if|for|while)\\s*\\(.*\\)\\s*|else\\s*)$", + // But make sure line doesn't have braces or is not another if statement + "beforeText": "^\\s+([^{i\\s]|i(?!f\\b))", + "action": { + "indent": "outdent" + } + } + ] } diff --git a/extensions/csharp/cgmanifest.json b/extensions/csharp/cgmanifest.json index 494aff45567..962188ea971 100644 --- a/extensions/csharp/cgmanifest.json +++ b/extensions/csharp/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "dotnet/csharp-tmLanguage", "repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage", - "commitHash": "5e7dd90d2af9817b0dfb614b21c79a3e81882d9f" + "commitHash": "772323937fedd65c6dc1c8ce6ea41d97415ed7d1" } }, "license": "MIT", diff --git a/extensions/csharp/syntaxes/csharp.tmLanguage.json b/extensions/csharp/syntaxes/csharp.tmLanguage.json index 6c5db82f06c..c08bea9ce01 100644 --- a/extensions/csharp/syntaxes/csharp.tmLanguage.json +++ b/extensions/csharp/syntaxes/csharp.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/dotnet/csharp-tmLanguage/commit/5e7dd90d2af9817b0dfb614b21c79a3e81882d9f", + "version": "https://github.com/dotnet/csharp-tmLanguage/commit/772323937fedd65c6dc1c8ce6ea41d97415ed7d1", "name": "C#", "scopeName": "source.cs", "patterns": [ @@ -57,10 +57,10 @@ "script-top-level": { "patterns": [ { - "include": "#method-declaration" + "include": "#statement" }, { - "include": "#statement" + "include": "#method-declaration" }, { "include": "#punctuation-semicolon" @@ -91,10 +91,10 @@ "include": "#interface-declaration" }, { - "include": "#record-declaration" + "include": "#struct-declaration" }, { - "include": "#struct-declaration" + "include": "#record-declaration" }, { "include": "#attribute-section" @@ -286,6 +286,9 @@ { "include": "#nameof-expression" }, + { + "include": "#default-literal-expression" + }, { "include": "#throw-expression" }, @@ -298,6 +301,9 @@ { "include": "#verbatim-interpolated-string" }, + { + "include": "#type-builtin" + }, { "include": "#this-or-base-expression" }, @@ -381,13 +387,19 @@ "using-directive": { "patterns": [ { - "begin": "\\b(using)\\b\\s+(static)\\s+", + "begin": "(\\b(global)\\b\\s+)?\\b(using)\\b\\s+(static)\\b\\s+(\\b(unsafe)\\b\\s+)?", "beginCaptures": { - "1": { + "2": { + "name": "keyword.other.global.cs" + }, + "3": { "name": "keyword.other.using.cs" }, - "2": { + "4": { "name": "keyword.other.static.cs" + }, + "6": { + "name": "storage.modifier.cs" } }, "end": "(?=;)", @@ -398,12 +410,18 @@ ] }, { - "begin": "\\b(using)\\s+(?=(@?[_[:alpha:]][_[:alnum:]]*)\\s*=)", + "begin": "(\\b(global)\\b\\s+)?\\b(using)\\b\\s+(\\b(unsafe)\\b\\s+)?(?=(@?[_[:alpha:]][_[:alnum:]]*)\\s*=)", "beginCaptures": { - "1": { + "2": { + "name": "keyword.other.global.cs" + }, + "3": { "name": "keyword.other.using.cs" }, - "2": { + "5": { + "name": "storage.modifier.cs" + }, + "6": { "name": "entity.name.type.alias.cs" } }, @@ -421,9 +439,12 @@ ] }, { - "begin": "\\b(using)\\s*", + "begin": "(\\b(global)\\b\\s+)?\\b(using)\\s*(?!\\(|\\s|var)", "beginCaptures": { - "1": { + "2": { + "name": "keyword.other.global.cs" + }, + "3": { "name": "keyword.other.using.cs" } }, @@ -574,23 +595,26 @@ }, "storage-modifier": { "name": "storage.modifier.cs", - "match": "(?\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* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n)\\s*\n(?=\\()", + "begin": "(?x)\n(new)(?:\\s+\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* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n))?\\s*\n(?=\\()", "beginCaptures": { "1": { "name": "keyword.other.new.cs" diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json index 7527b230e5d..2cdaf061ea9 100644 --- a/extensions/css-language-features/package.json +++ b/extensions/css-language-features/package.json @@ -994,7 +994,7 @@ ] }, "dependencies": { - "vscode-languageclient": "^8.2.0-next.0", + "vscode-languageclient": "^8.2.0-next.1", "vscode-uri": "^3.0.7" }, "devDependencies": { diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json index e5c464c56e8..bcf7e51ea88 100644 --- a/extensions/css-language-features/server/package.json +++ b/extensions/css-language-features/server/package.json @@ -10,9 +10,9 @@ "main": "./out/node/cssServerMain", "browser": "./dist/browser/cssServerMain", "dependencies": { - "@vscode/l10n": "^0.0.13", - "vscode-css-languageservice": "^6.2.5", - "vscode-languageserver": "^8.2.0-next.0", + "@vscode/l10n": "^0.0.14", + "vscode-css-languageservice": "^6.2.6", + "vscode-languageserver": "^8.2.0-next.1", "vscode-uri": "^3.0.7" }, "devDependencies": { diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock index 84c18a29173..75a7ede426f 100644 --- a/extensions/css-language-features/server/yarn.lock +++ b/extensions/css-language-features/server/yarn.lock @@ -12,17 +12,17 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -"@vscode/l10n@^0.0.13": - version "0.0.13" - resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.13.tgz#f51ff130b8c98f189476c5f812d214b8efb09590" - integrity sha512-A3uY356uOU9nGa+TQIT/i3ziWUgJjVMUrGGXSrtRiTwklyCFjGVWIOHoEIHbJpiyhDkJd9kvIWUOfXK1IkK8XQ== +"@vscode/l10n@^0.0.14": + version "0.0.14" + resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.14.tgz#431e5814c35c3cb11ee21873bc70a4b0fbf90fcf" + integrity sha512-/yrv59IEnmh655z1oeDnGcvMYwnEzNzHLgeYcQCkhYX0xBvYWrAuefoiLcPBUkMpJsb46bqQ6Yv4pwTTQ4d3Qg== -vscode-css-languageservice@^6.2.5: - version "6.2.5" - resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.5.tgz#bcea53dac7b61c1ff483668a7403042779ab27b0" - integrity sha512-/1oyBZK3jfx6A0cA46FCUpy6OlqEsMT47LUIldCIP1YMKRYezJ9No+aNj9IM0AqhRZ92DxZ1DmU5lJ+biuiacA== +vscode-css-languageservice@^6.2.6: + version "6.2.6" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.6.tgz#bc26c2abaaa2eb117b143fdb9387ee1701d9661a" + integrity sha512-SA2WkeOecIpUiEbZnjOsP/fI5CRITZEiQGSHXKiDQDwLApfKcnLhZwMtOBbIifSzESVcQa7b/shX/nbnF4NoCg== dependencies: - "@vscode/l10n" "^0.0.13" + "@vscode/l10n" "^0.0.14" vscode-languageserver-textdocument "^1.0.8" vscode-languageserver-types "^3.17.3" vscode-uri "^3.0.7" @@ -32,10 +32,10 @@ vscode-jsonrpc@8.2.0-next.0: resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageserver-protocol@3.17.4-next.0: - version "3.17.4-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" - integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== +vscode-languageserver-protocol@3.17.4-next.1: + version "3.17.4-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.1.tgz#a15480e1bc663853ae90ded226efafc5ab333616" + integrity sha512-qrK4BycgPR/+nkRN9PRVTblkLp+kUPUmAgF6rDhFzZIPXW4/MqWwFUT8uswIMGdlTPPgCEkFO/AYEZK1fDXODg== dependencies: vscode-jsonrpc "8.2.0-next.0" vscode-languageserver-types "3.17.4-next.0" @@ -55,12 +55,12 @@ vscode-languageserver-types@^3.17.3: resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64" integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA== -vscode-languageserver@^8.2.0-next.0: - version "8.2.0-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.2.0-next.0.tgz#ad9bcef650e0bae9d32591ebbda3eb5e548418a7" - integrity sha512-Pw1pdR+hZvaeeVvbmEscUJG0SMMa5//iV+OnFuv4cPPvk+ohe4mtrVAcI06Z9HIMxDu+2McqY1b8JbVvyRKFtg== +vscode-languageserver@^8.2.0-next.1: + version "8.2.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.2.0-next.1.tgz#ad2558d74392b1cfaccd427febe9a368fc328f8b" + integrity sha512-994AXMKBijzjlnpf8p9M+ntsNJDjR8pr55NJPYxKjy/nUhVkg962dAomelH6Z94401kBZmSbfP/K/20cB54aFA== dependencies: - vscode-languageserver-protocol "3.17.4-next.0" + vscode-languageserver-protocol "3.17.4-next.1" vscode-uri@^3.0.7: version "3.0.7" diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock index f9d868af01f..d39fbd0e22f 100644 --- a/extensions/css-language-features/yarn.lock +++ b/extensions/css-language-features/yarn.lock @@ -34,9 +34,9 @@ minimatch@^5.1.0: brace-expansion "^2.0.1" semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" @@ -45,19 +45,19 @@ vscode-jsonrpc@8.2.0-next.0: resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageclient@^8.2.0-next.0: - version "8.2.0-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.2.0-next.0.tgz#7415c831c4c1e38cc08e710e744c36c5d2251bd8" - integrity sha512-Gqr47Up5VDuRT8JrfB0QFGXR9ngQDkfIJfbT0xmM4OIsISqH3uUgXHTAhekRtS4N6aER3UvGXUrrRWQUaBGYHA== +vscode-languageclient@^8.2.0-next.1: + version "8.2.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.2.0-next.1.tgz#a3f98b80cfa3225fde0583aa6a5c9b20219fa37e" + integrity sha512-oITaqHQ10PM3zXCUu/104wriMeDutXMkQXMaRBWh1jKihcNcUBLC/os7RhqiVGypY0nl+F0pwStAf4Koc8inaw== dependencies: minimatch "^5.1.0" semver "^7.3.7" - vscode-languageserver-protocol "3.17.4-next.0" + vscode-languageserver-protocol "3.17.4-next.1" -vscode-languageserver-protocol@3.17.4-next.0: - version "3.17.4-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" - integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== +vscode-languageserver-protocol@3.17.4-next.1: + version "3.17.4-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.1.tgz#a15480e1bc663853ae90ded226efafc5ab333616" + integrity sha512-qrK4BycgPR/+nkRN9PRVTblkLp+kUPUmAgF6rDhFzZIPXW4/MqWwFUT8uswIMGdlTPPgCEkFO/AYEZK1fDXODg== dependencies: vscode-jsonrpc "8.2.0-next.0" vscode-languageserver-types "3.17.4-next.0" diff --git a/extensions/css/cgmanifest.json b/extensions/css/cgmanifest.json index e64ba7e11ae..fe46b5c4acd 100644 --- a/extensions/css/cgmanifest.json +++ b/extensions/css/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "microsoft/vscode-css", "repositoryUrl": "https://github.com/microsoft/vscode-css", - "commitHash": "1452547185a1793c946cf67f8c7c9001716e32c3" + "commitHash": "3bd00206f6b0d16eb2eba53fb886462eb8c58baa" } }, "licenseDetail": [ diff --git a/extensions/css/syntaxes/css.tmLanguage.json b/extensions/css/syntaxes/css.tmLanguage.json index c50611017c2..c44db9bd68f 100644 --- a/extensions/css/syntaxes/css.tmLanguage.json +++ b/extensions/css/syntaxes/css.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/vscode-css/commit/1452547185a1793c946cf67f8c7c9001716e32c3", + "version": "https://github.com/microsoft/vscode-css/commit/3bd00206f6b0d16eb2eba53fb886462eb8c58baa", "name": "CSS", "scopeName": "source.css", "patterns": [ @@ -850,7 +850,7 @@ ] }, { - "begin": "(?i)(? e.affectsConfiguration(setting)) ) { - updateAutoAttach(State.Disabled); - updateAutoAttach(readCurrentState()); + refreshAutoAttachVars(); } }), ); @@ -85,6 +85,11 @@ export async function deactivate(): Promise { await destroyAttachServer(); } +function refreshAutoAttachVars() { + updateAutoAttach(State.Disabled); + updateAutoAttach(readCurrentState()); +} + function getDefaultScope(info: ReturnType) { if (!info) { return vscode.ConfigurationTarget.Global; @@ -204,8 +209,22 @@ async function createAttachServer(context: vscode.ExtensionContext) { return undefined; } - server = createServerInner(ipcAddress).catch(err => { - console.error(err); + server = createServerInner(ipcAddress).catch(async err => { + console.error('[debug-auto-launch] Error creating auto attach server: ', err); + + if (process.platform !== 'win32') { + // On macOS, and perhaps some Linux distros, the temporary directory can + // sometimes change. If it looks like that's the cause of a listener + // error, automatically refresh the auto attach vars. + try { + await fs.access(dirname(ipcAddress)); + } catch { + console.error('[debug-auto-launch] Refreshing variables from error'); + refreshAutoAttachVars(); + return undefined; + } + } + return undefined; }); diff --git a/extensions/debug-server-ready/src/extension.ts b/extensions/debug-server-ready/src/extension.ts index d5f51150680..307b5e25475 100644 --- a/extensions/debug-server-ready/src/extension.ts +++ b/extensions/debug-server-ready/src/extension.ts @@ -308,8 +308,8 @@ class ServerReadyDetector extends vscode.Disposable { export function activate(context: vscode.ExtensionContext) { - context.subscriptions.push(vscode.debug.onDidChangeActiveDebugSession(session => { - if (session && session.configuration.serverReadyAction) { + context.subscriptions.push(vscode.debug.onDidStartDebugSession(session => { + if (session.configuration.serverReadyAction) { const detector = ServerReadyDetector.start(session); if (detector) { ServerReadyDetector.startListeningTerminalData(); diff --git a/extensions/emmet/src/test/abbreviationAction.test.ts b/extensions/emmet/src/test/abbreviationAction.test.ts index 3f18a1ffc5d..17ccacfc94a 100644 --- a/extensions/emmet/src/test/abbreviationAction.test.ts +++ b/extensions/emmet/src/test/abbreviationAction.test.ts @@ -47,8 +47,6 @@ const invokeCompletionContext: CompletionContext = { }; suite('Tests for Expand Abbreviations (HTML)', () => { - const oldValueForExcludeLanguages = workspace.getConfiguration('emmet').inspect('excludeLanguages'); - const oldValueForIncludeLanguages = workspace.getConfiguration('emmet').inspect('includeLanguages'); teardown(closeAllEditors); test('Expand snippets (HTML)', () => { @@ -364,6 +362,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => { }); test('Expand html when inside script tag with javascript type if js is mapped to html (HTML)', async () => { + const oldConfig = workspace.getConfiguration('emmet').inspect('includeLanguages')?.globalValue; await workspace.getConfiguration('emmet').update('includeLanguages', { 'javascript': 'html' }, ConfigurationTarget.Global); await withRandomFileEditor(htmlContents, 'html', async (editor, _doc) => { editor.selection = new Selection(24, 10, 24, 10); @@ -374,12 +373,13 @@ suite('Tests for Expand Abbreviations (HTML)', () => { await expandPromise; assert.strictEqual(editor.document.getText(), htmlContents.replace('span.bye', '')); }); - return workspace.getConfiguration('emmet').update('includeLanguages', oldValueForIncludeLanguages || {}, ConfigurationTarget.Global); + await workspace.getConfiguration('emmet').update('includeLanguages', oldConfig, ConfigurationTarget.Global); }); test('Expand html in completion list when inside script tag with javascript type if js is mapped to html (HTML)', async () => { const abbreviation = 'span.bye'; const expandedText = ''; + const oldConfig = workspace.getConfiguration('emmet').inspect('includeLanguages')?.globalValue; await workspace.getConfiguration('emmet').update('includeLanguages', { 'javascript': 'html' }, ConfigurationTarget.Global); await withRandomFileEditor(htmlContents, 'html', async (editor, _doc) => { editor.selection = new Selection(24, 10, 24, 10); @@ -399,7 +399,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => { assert.strictEqual(((emmetCompletionItem.documentation) || '').replace(/\|/g, ''), expandedText, `Docs of completion item doesnt match.`); return Promise.resolve(); }); - return workspace.getConfiguration('emmet').update('includeLanguages', oldValueForIncludeLanguages || {}, ConfigurationTarget.Global); + await workspace.getConfiguration('emmet').update('includeLanguages', oldConfig, ConfigurationTarget.Global); }); // test('No expanding when html is excluded in the settings', () => { @@ -411,9 +411,10 @@ suite('Tests for Expand Abbreviations (HTML)', () => { // }); test('No expanding when html is excluded in the settings in completion list', async () => { + const oldConfig = workspace.getConfiguration('emmet').inspect('excludeLanguages')?.globalValue; await workspace.getConfiguration('emmet').update('excludeLanguages', ['html'], ConfigurationTarget.Global); await testHtmlCompletionProvider(new Selection(9, 6, 9, 6), '', '', true); - return workspace.getConfiguration('emmet').update('excludeLanguages', oldValueForExcludeLanguages ? oldValueForExcludeLanguages.globalValue : undefined, ConfigurationTarget.Global); + await workspace.getConfiguration('emmet').update('excludeLanguages', oldConfig, ConfigurationTarget.Global); }); // test('No expanding when php (mapped syntax) is excluded in the settings', () => { diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock index 886d4d8d83d..f5321aede70 100644 --- a/extensions/emmet/yarn.lock +++ b/extensions/emmet/yarn.lock @@ -2,19 +2,19 @@ # yarn lockfile v1 -"@emmetio/abbreviation@^2.3.2": - version "2.3.2" - resolved "https://registry.yarnpkg.com/@emmetio/abbreviation/-/abbreviation-2.3.2.tgz#375bf6bc6ae6405f62dd0ddab2559b46502d01f4" - integrity sha512-8vqkn4rtjm5Zv34RPgsq3/ij88ri+IcfC2MxPELytrQvfpaLyppscE0YSwDVuIUR6KL5GCBUfr5Mo7SHSbswpA== +"@emmetio/abbreviation@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz#ed2b88fe37b972292d6026c7c540aaf887cecb6e" + integrity sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA== dependencies: - "@emmetio/scanner" "^1.0.3" + "@emmetio/scanner" "^1.0.4" -"@emmetio/css-abbreviation@^2.1.7": - version "2.1.7" - resolved "https://registry.yarnpkg.com/@emmetio/css-abbreviation/-/css-abbreviation-2.1.7.tgz#9791269586d780cf4b40078ea79886d1888a188a" - integrity sha512-nrOt3/QROjYYK1cMjoO5fCfHIf0hFpcZeQQt7Ew6ixZ0ElEEs77ijnY57HC6ti91W/mn+c1T7ET8sClBMRHHBg== +"@emmetio/css-abbreviation@^2.1.8": + version "2.1.8" + resolved "https://registry.yarnpkg.com/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz#b785313486eba6cb7eb623ad39378c4e1063dc00" + integrity sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw== dependencies: - "@emmetio/scanner" "^1.0.3" + "@emmetio/scanner" "^1.0.4" "@emmetio/css-parser@ramya-rao-a/css-parser#vscode": version "0.4.0" @@ -38,11 +38,6 @@ dependencies: "@emmetio/scanner" "^1.0.4" -"@emmetio/scanner@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@emmetio/scanner/-/scanner-1.0.3.tgz#755e581517e2302d31a387e4064bf73035ebfc46" - integrity sha512-/EFyTijquAwKMGSBd50RnjxsfDXmZAFp71PGu7sM6LEnEJXMV+FKL7Rvr6YLu4czQmPVRsfyhcbQz+WZnM4AZw== - "@emmetio/scanner@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@emmetio/scanner/-/scanner-1.0.4.tgz#e9cdc67194fd91f8b7eb141014be4f2d086c15f1" @@ -64,9 +59,9 @@ integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== "@vscode/emmet-helper@^2.8.8": - version "2.8.8" - resolved "https://registry.yarnpkg.com/@vscode/emmet-helper/-/emmet-helper-2.8.8.tgz#df64989d2812e031cd6393ce896a2fe33ae976bd" - integrity sha512-QuD4CmNeXSFxuP8VZwI6qL+8vmmd7JcSdwsEIdsrzb4YumWs/+4rXRX9MM+NsFfUO69g6ezngCD7XRd6jY9TQw== + version "2.9.2" + resolved "https://registry.yarnpkg.com/@vscode/emmet-helper/-/emmet-helper-2.9.2.tgz#cd5d1e64e7138ad76300e8cba5fd84f1c03e13ee" + integrity sha512-MaGuyW+fa13q3aYsluKqclmh62Hgp0BpKIqS66fCxfOaBcVQ1OnMQxRRgQUYnCkxFISAQlkJ0qWWPyXjro1Qrg== dependencies: emmet "^2.4.3" jsonc-parser "^2.3.0" @@ -75,12 +70,12 @@ vscode-uri "^2.1.2" emmet@^2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.4.3.tgz#c99f19e572a270da27f456dd7f65dfda83dc0ec1" - integrity sha512-Bq6zozVDVrLbBmKdosI9Q2DvrFh/ehwnNjgDRsvGVjPOEAhMKie9HwQnPuUi3NOZ2itVGyRwsLAdufnG9DVFwg== + version "2.4.4" + resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.4.4.tgz#801aad64659dc76f3003130db767d77a78ac298e" + integrity sha512-v8Mwpjym55CS3EjJgiCLWUB3J2HSR93jhzXW325720u8KvYxdI2voYLstW3pHBxFz54H6jFjayR9G4LfTG0q+g== dependencies: - "@emmetio/abbreviation" "^2.3.2" - "@emmetio/css-abbreviation" "^2.1.7" + "@emmetio/abbreviation" "^2.3.3" + "@emmetio/css-abbreviation" "^2.1.8" image-size@~1.0.0: version "1.0.0" diff --git a/extensions/esbuild-webview-common.js b/extensions/esbuild-webview-common.js new file mode 100644 index 00000000000..c7a20839947 --- /dev/null +++ b/extensions/esbuild-webview-common.js @@ -0,0 +1,90 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// @ts-check + +/** + * @fileoverview Common build script for extension scripts used in in webviews. + */ + +const path = require('path'); +const esbuild = require('esbuild'); + +/** + * @typedef {Partial & { + * entryPoints: string[] | Record | { in: string, out: string }[]; + * outdir: string; + * }} BuildOptions + */ + +/** + * Build the source code once using esbuild. + * + * @param {BuildOptions} options + * @param {(outDir: string) => unknown} [didBuild] + */ +async function build(options, didBuild) { + await esbuild.build({ + bundle: true, + minify: true, + sourcemap: false, + format: 'esm', + platform: 'browser', + target: ['es2020'], + ...options, + }); + + await didBuild?.(options.outdir); +} + +/** + * Build the source code once using esbuild, logging errors instead of throwing. + * + * @param {BuildOptions} options + * @param {(outDir: string) => unknown} [didBuild] + */ +async function tryBuild(options, didBuild) { + try { + await build(options, didBuild); + } catch (err) { + console.error(err); + } +} + +/** + * @param {{ + * srcDir: string; + * outdir: string; + * entryPoints: string[] | Record | { in: string, out: string }[]; + * additionalOptions?: Partial + * }} config + * @param {string[]} args + * @param {(outDir: string) => unknown} [didBuild] + */ +module.exports.run = async function (config, args, didBuild) { + let outdir = config.outdir; + const outputRootIndex = args.indexOf('--outputRoot'); + if (outputRootIndex >= 0) { + const outputRoot = args[outputRootIndex + 1]; + const outputDirName = path.basename(outdir); + outdir = path.join(outputRoot, outputDirName); + } + + /** @type {BuildOptions} */ + const resolvedOptions = { + entryPoints: config.entryPoints, + outdir, + ...(config.additionalOptions || {}), + }; + + const isWatch = args.indexOf('--watch') >= 0; + if (isWatch) { + await tryBuild(resolvedOptions, didBuild); + + const watcher = require('@parcel/watcher'); + watcher.subscribe(config.srcDir, () => tryBuild(resolvedOptions, didBuild)); + } else { + return build(resolvedOptions, didBuild).catch(() => process.exit(1)); + } +}; diff --git a/extensions/fsharp/cgmanifest.json b/extensions/fsharp/cgmanifest.json index a3f2c2601b8..b81869f111a 100644 --- a/extensions/fsharp/cgmanifest.json +++ b/extensions/fsharp/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "ionide/ionide-fsgrammar", "repositoryUrl": "https://github.com/ionide/ionide-fsgrammar", - "commitHash": "713cd4a34e7729e444cf85ae287dd94c19e34337" + "commitHash": "8740e610a367c5e3f15be716acc7207655ced4cf" } }, "license": "MIT", diff --git a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json index 9d1f8c1c82f..39c34a97b25 100644 --- a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json +++ b/extensions/fsharp/syntaxes/fsharp.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/ionide/ionide-fsgrammar/commit/713cd4a34e7729e444cf85ae287dd94c19e34337", + "version": "https://github.com/ionide/ionide-fsgrammar/commit/8740e610a367c5e3f15be716acc7207655ced4cf", "name": "fsharp", "scopeName": "source.fsharp", "patterns": [ @@ -241,7 +241,7 @@ "match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|enum|member|try|finally|and|when|or|use|use\\!|struct|while|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b" }, { - "name": "keyword.fsharp", + "name": "keyword.symbol.fsharp", "match": ":" }, { @@ -314,7 +314,7 @@ }, { "match": "(?!when|and|or\\b)\\b([\\w0-9'`^._]+)", - "comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted", + "comments": "Here we need the \\w modifier in order to check that the words are allowed", "captures": { "1": { "name": "entity.name.type.fsharp" @@ -488,7 +488,7 @@ "end": "\\s*(?=(->))", "beginCaptures": { "1": { - "name": "keyword.symbol.arrow.fsharp" + "name": "keyword.symbol.fsharp" } }, "endCaptures": { @@ -607,7 +607,7 @@ "constants": { "patterns": [ { - "name": "constant.language.unit.fsharp", + "name": "keyword.symbol.fsharp", "match": "\\(\\)" }, { @@ -624,7 +624,7 @@ }, { "name": "constant.other.fsharp", - "match": "\\b(null|unit|void)\\b" + "match": "\\b(null|void)\\b" } ] }, @@ -643,7 +643,7 @@ "name": "support.function.attribute.fsharp" }, "5": { - "name": "keyword.fsharp" + "name": "keyword.symbol.fsharp" } }, "endCaptures": { @@ -813,7 +813,7 @@ "match": "(->)\\s*(\\()?\\s*([?[:alpha:]0-9'`^._ ]+)*", "captures": { "1": { - "name": "keyword.symbol.fsharp" + "name": "keyword.symbol.arrow.fsharp" }, "2": { "name": "keyword.symbol.fsharp" @@ -929,7 +929,7 @@ { "name": "binding.fsharp", "begin": "\\b(let mutable|static let mutable|static let|let inline|let|and|member val|static member inline|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?", - "end": "\\s*(with\\b|=|\\n+=|(?<=\\=))", + "end": "\\s*((with\\b)|(=|\\n+=|(?<=\\=)))", "beginCaptures": { "1": { "name": "keyword.fsharp" @@ -948,8 +948,11 @@ } }, "endCaptures": { - "1": { + "2": { "name": "keyword.fsharp" + }, + "3": { + "name": "keyword.symbol.fsharp" } }, "patterns": [ @@ -969,7 +972,7 @@ }, "endCaptures": { "1": { - "name": "keyword.fsharp" + "name": "keyword.symbol.fsharp" } }, "patterns": [ @@ -989,7 +992,7 @@ }, "endCaptures": { "1": { - "name": "keyword.fsharp" + "name": "keyword.symbol.fsharp" } }, "patterns": [ @@ -1034,12 +1037,12 @@ "name": "keyword.fsharp" }, "2": { - "name": "keyword.fsharp" + "name": "keyword.symbol.fsharp" } }, "endCaptures": { "1": { - "name": "keyword.fsharp" + "name": "keyword.symbol.fsharp" } }, "patterns": [ @@ -1110,19 +1113,19 @@ }, { "name": "keyword.fsharp", - "match": "\\b(private|to|public|internal|function|class|exception|delegate|of|as|begin|end|inherit|let!|interface|abstract|enum|member|and|when|or|use|use\\!|struct|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b" + "match": "\\b(private|to|public|internal|function|class|exception|delegate|of|new|as|begin|end|inherit|let!|interface|abstract|enum|member|and|when|or|use|use\\!|struct|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b" }, { "name": "keyword.control", "match": "\\b(match|yield|yield!|with|if|then|else|elif|for|in|return!|return|try|finally|while|do)(?!')\\b" }, { - "name": "keyword.symbol.new", - "match": "\\b(new)\\b" + "name": "keyword.symbol.arrow.fsharp", + "match": "(\\->|\\<\\-)" }, { "name": "keyword.symbol.fsharp", - "match": "(&&&|\\|\\|\\||\\^\\^\\^|~~~|<<<|>>>|\\|>|\\->|\\<\\-|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|{|}|\\||_|\\.\\.|\\,|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\(|\\)|\\<\\<)" + "match": "(&&&|\\|\\|\\||\\^\\^\\^|~~~|<<<|>>>|\\|>|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|{|}|\\||_|\\.\\.|\\,|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\(|\\)|\\<\\<)" } ] }, @@ -1208,7 +1211,7 @@ "name": "entity.name.type.namespace.fsharp" }, "3": { - "name": "punctuation.separator.namespace-definition.fsharp" + "name": "keyword.symbol.fsharp" }, "4": { "name": "entity.name.section.fsharp" @@ -1324,7 +1327,7 @@ "variables": { "patterns": [ { - "name": "constant.language.unit.fsharp", + "name": "keyword.symbol.fsharp", "match": "\\(\\)" }, { @@ -1347,7 +1350,7 @@ "end": "(>)", "beginCaptures": { "1": { - "name": "keyword.symbol.fsharp" + "name": "keyword.symbol.arrow.fsharp" }, "2": { "name": "entity.name.type.fsharp" @@ -1379,7 +1382,7 @@ "match": "\\s*(->)\\s*(?!with|get|set\\b)\\b([\\w0-9'`^._]+)", "captures": { "1": { - "name": "keyword.symbol.fsharp" + "name": "keyword.symbol.arrow.fsharp" }, "2": { "name": "entity.name.type.fsharp" @@ -1582,7 +1585,7 @@ "name": "keyword.symbol.fsharp" }, "7": { - "name": "constant.language.unit.fsharp" + "name": "keyword.symbol.fsharp" } }, "patterns": [ @@ -1605,12 +1608,12 @@ "end": "((?)", "beginCaptures": { "1": { - "name": "keyword.fsharp" + "name": "keyword.symbol.fsharp" } }, "endCaptures": { "1": { - "name": "keyword.fsharp" + "name": "keyword.symbol.fsharp" } }, "patterns": [ @@ -1671,9 +1674,6 @@ "match": "\\s*(private|internal|public)", "captures": { "1": { - "name": "keyword.symbol.fsharp" - }, - "2": { "name": "storage.modifier.fsharp" } } @@ -1792,7 +1792,7 @@ "patterns": [ { "name": "cexpr.fsharp", - "match": "\\b(async|seq|promise|task|maybe|asyncMaybe|controller|scope|application|pipeline)\\s*\\{", + "match": "\\b(async|seq|promise|task|maybe|asyncMaybe|controller|scope|application|pipeline)(?=\\s*\\{)", "captures": { "0": { "name": "keyword.fsharp" diff --git a/extensions/git-base/src/api/api1.ts b/extensions/git-base/src/api/api1.ts index 7b261f10683..005a7930356 100644 --- a/extensions/git-base/src/api/api1.ts +++ b/extensions/git-base/src/api/api1.ts @@ -5,9 +5,9 @@ import { Disposable, commands } from 'vscode'; import { Model } from '../model'; -import { pickRemoteSource } from '../remoteSource'; +import { getRemoteSourceActions, pickRemoteSource } from '../remoteSource'; import { GitBaseExtensionImpl } from './extension'; -import { API, PickRemoteSourceOptions, PickRemoteSourceResult, RemoteSourceProvider } from './git-base'; +import { API, PickRemoteSourceOptions, PickRemoteSourceResult, RemoteSourceAction, RemoteSourceProvider } from './git-base'; export class ApiImpl implements API { @@ -17,6 +17,10 @@ export class ApiImpl implements API { return pickRemoteSource(this._model, options as any); } + getRemoteSourceActions(url: string): Promise { + return getRemoteSourceActions(this._model, url); + } + registerRemoteSourceProvider(provider: RemoteSourceProvider): Disposable { return this._model.registerRemoteSourceProvider(provider); } diff --git a/extensions/git-base/src/api/git-base.d.ts b/extensions/git-base/src/api/git-base.d.ts index 8510df6d043..53cac4d5c70 100644 --- a/extensions/git-base/src/api/git-base.d.ts +++ b/extensions/git-base/src/api/git-base.d.ts @@ -44,6 +44,15 @@ export interface PickRemoteSourceResult { readonly branch?: string; } +export interface RemoteSourceAction { + readonly label: string; + /** + * Codicon name + */ + readonly icon: string; + run(branch: string): void; +} + export interface RemoteSource { readonly name: string; readonly description?: string; @@ -70,6 +79,7 @@ export interface RemoteSourceProvider { readonly supportsQuery?: boolean; getBranches?(url: string): ProviderResult; + getRemoteSourceActions?(url: string): ProviderResult; getRecentRemoteSources?(query?: string): ProviderResult; getRemoteSources(query?: string): ProviderResult; } diff --git a/extensions/git-base/src/remoteSource.ts b/extensions/git-base/src/remoteSource.ts index d7fb85c620f..05831eb010b 100644 --- a/extensions/git-base/src/remoteSource.ts +++ b/extensions/git-base/src/remoteSource.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { QuickPickItem, window, QuickPick, QuickPickItemKind, l10n } from 'vscode'; -import { RemoteSourceProvider, RemoteSource, PickRemoteSourceOptions, PickRemoteSourceResult } from './api/git-base'; +import { RemoteSourceProvider, RemoteSource, PickRemoteSourceOptions, PickRemoteSourceResult, RemoteSourceAction } from './api/git-base'; import { Model } from './model'; import { throttle, debounce } from './decorators'; @@ -81,6 +81,20 @@ class RemoteSourceProviderQuickPick { } } +export async function getRemoteSourceActions(model: Model, url: string): Promise { + const providers = model.getRemoteProviders(); + + const remoteSourceActions = []; + for (const provider of providers) { + const providerActions = await provider.getRemoteSourceActions?.(url); + if (providerActions?.length) { + remoteSourceActions.push(...providerActions); + } + } + + return remoteSourceActions; +} + export async function pickRemoteSource(model: Model, options: PickRemoteSourceOptions & { branch?: false | undefined }): Promise; export async function pickRemoteSource(model: Model, options: PickRemoteSourceOptions & { branch: true }): Promise; export async function pickRemoteSource(model: Model, options: PickRemoteSourceOptions = {}): Promise { diff --git a/extensions/git/package.json b/extensions/git/package.json index e13864027b8..f45447de7f1 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -13,7 +13,7 @@ "diffCommand", "contribEditorContentMenu", "contribEditSessions", - "canonicalUriIdentityProvider", + "canonicalUriProvider", "contribViewsWelcome", "editSessionIdentityProvider", "quickDiffProvider", @@ -84,6 +84,12 @@ "category": "Git", "enablement": "!operationInProgress" }, + { + "command": "git.reopenClosedRepositories", + "title": "%command.reopenClosedRepositories%", + "category": "Git", + "enablement": "!operationInProgress && git.closedRepositoryCount != 0" + }, { "command": "git.close", "title": "%command.close%", @@ -248,6 +254,20 @@ "icon": "$(check)", "enablement": "!operationInProgress" }, + { + "command": "git.commitAmend", + "title": "%command.commitAmend%", + "category": "Git", + "icon": "$(check)", + "enablement": "!operationInProgress" + }, + { + "command": "git.commitSigned", + "title": "%command.commitSigned%", + "category": "Git", + "icon": "$(check)", + "enablement": "!operationInProgress" + }, { "command": "git.commitStaged", "title": "%command.commitStaged%", @@ -315,6 +335,18 @@ "category": "Git", "enablement": "!operationInProgress" }, + { + "command": "git.commitAmendNoVerify", + "title": "%command.commitAmendNoVerify%", + "category": "Git", + "enablement": "!operationInProgress" + }, + { + "command": "git.commitSignedNoVerify", + "title": "%command.commitSignedNoVerify%", + "category": "Git", + "enablement": "!operationInProgress" + }, { "command": "git.commitStagedAmendNoVerify", "title": "%command.commitStagedAmendNoVerify%", @@ -867,6 +899,14 @@ "command": "git.commit", "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0" }, + { + "command": "git.commitAmend", + "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0" + }, + { + "command": "git.commitSigned", + "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0" + }, { "command": "git.commitStaged", "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0" @@ -915,6 +955,14 @@ "command": "git.commitStagedSignedNoVerify", "when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0" }, + { + "command": "git.commitAmendNoVerify", + "when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0" + }, + { + "command": "git.commitSignedNoVerify", + "when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0" + }, { "command": "git.commitStagedAmendNoVerify", "when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0" @@ -1766,53 +1814,71 @@ }, { "command": "git.commitNoVerify", - "group": "1_commit@6", + "group": "2_commit_noverify@1", "when": "config.git.allowNoVerifyCommit" }, { "command": "git.commitStagedNoVerify", - "group": "1_commit@7", + "group": "2_commit_noverify@2", "when": "config.git.allowNoVerifyCommit" }, { "command": "git.commitAllNoVerify", - "group": "1_commit@8", + "group": "2_commit_noverify@3", "when": "config.git.allowNoVerifyCommit" }, + { + "command": "git.commitAmend", + "group": "3_amend@1" + }, { "command": "git.commitStagedAmend", - "group": "2_amend@1" + "group": "3_amend@2" }, { "command": "git.commitAllAmend", - "group": "2_amend@2" + "group": "3_amend@3" + }, + { + "command": "git.commitAmendNoVerify", + "group": "4_amend_noverify@1", + "when": "config.git.allowNoVerifyCommit" }, { "command": "git.commitStagedAmendNoVerify", - "group": "2_amend@3", + "group": "4_amend_noverify@2", "when": "config.git.allowNoVerifyCommit" }, { "command": "git.commitAllAmendNoVerify", - "group": "2_amend@4", + "group": "4_amend_noverify@3", "when": "config.git.allowNoVerifyCommit" }, + { + "command": "git.commitSigned", + "group": "5_signoff@1" + }, { "command": "git.commitStagedSigned", - "group": "3_signoff@1" + "group": "5_signoff@2" }, { "command": "git.commitAllSigned", - "group": "3_signoff@2" + "group": "5_signoff@3" + }, + { + "command": "git.commitSignedNoVerify", + "group": "6_signoff_noverify@1", + "when": "config.git.allowNoVerifyCommit" }, { "command": "git.commitStagedSignedNoVerify", - "group": "3_signoff@3", + "group": "6_signoff_noverify@2", "when": "config.git.allowNoVerifyCommit" }, { "command": "git.commitAllSignedNoVerify", - "group": "3_signoff@4", + "group": "6_signoff_noverify@3", "when": "config.git.allowNoVerifyCommit" } ], @@ -1886,31 +1952,31 @@ "git.branch": [ { "command": "git.merge", - "group": "branch@1" + "group": "1_merge@1" }, { "command": "git.rebase", - "group": "branch@2" + "group": "1_merge@2" }, { "command": "git.branch", - "group": "branch@3" + "group": "2_branch@1" }, { "command": "git.branchFrom", - "group": "branch@4" + "group": "2_branch@2" }, { "command": "git.renameBranch", - "group": "branch@5" + "group": "3_modify@1" }, { "command": "git.deleteBranch", - "group": "branch@6" + "group": "3_modify@2" }, { "command": "git.publish", - "group": "branch@7" + "group": "4_publish@1" } ], "git.remotes": [ @@ -1926,40 +1992,40 @@ "git.stash": [ { "command": "git.stash", - "group": "stash@1" + "group": "1_stash@1" }, { "command": "git.stashIncludeUntracked", - "group": "stash@2" + "group": "1_stash@2" }, { "command": "git.stashStaged", "when": "gitVersion2.35", - "group": "stash@3" + "group": "1_stash@3" }, { "command": "git.stashApplyLatest", - "group": "stash@4" + "group": "2_apply@1" }, { "command": "git.stashApply", - "group": "stash@5" + "group": "2_apply@2" }, { "command": "git.stashPopLatest", - "group": "stash@6" + "group": "3_pop@1" }, { "command": "git.stashPop", - "group": "stash@7" + "group": "3_pop@2" }, { "command": "git.stashDrop", - "group": "stash@8" + "group": "4_drop@1" }, { "command": "git.stashDropAll", - "group": "stash@9" + "group": "4_drop@2" } ], "git.tags": [ @@ -2076,7 +2142,7 @@ }, "git.defaultBranchName": { "type": "string", - "description": "%config.defaultBranchName%", + "markdownDescription": "%config.defaultBranchName%", "default": "main", "scope": "resource" }, @@ -2713,7 +2779,7 @@ "default": 50, "minimum": 0, "maximum": 100, - "description": "%config.similarityThreshold%", + "markdownDescription": "%config.similarityThreshold%", "scope": "resource" } } @@ -2860,14 +2926,14 @@ { "view": "scm", "contents": "%view.workbench.scm.empty%", - "when": "config.git.enabled && !git.missing && workbenchState == empty && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0", + "when": "config.git.enabled && !git.missing && workbenchState == empty && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0 && git.closedRepositoryCount == 0", "enablement": "git.state == initialized", "group": "2_open@1" }, { "view": "scm", "contents": "%view.workbench.scm.emptyWorkspace%", - "when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount == 0 && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0", + "when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount == 0 && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0 && git.closedRepositoryCount == 0", "enablement": "git.state == initialized", "group": "2_open@1" }, @@ -2884,13 +2950,13 @@ { "view": "scm", "contents": "%view.workbench.scm.folder%", - "when": "config.git.enabled && !git.missing && git.state == initialized && workbenchState == folder && scmRepositoryCount == 0 && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0 && remoteName != 'codespaces'", + "when": "config.git.enabled && !git.missing && git.state == initialized && workbenchState == folder && scmRepositoryCount == 0 && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0 && git.closedRepositoryCount == 0 && remoteName != 'codespaces'", "group": "5_scm@1" }, { "view": "scm", "contents": "%view.workbench.scm.workspace%", - "when": "config.git.enabled && !git.missing && git.state == initialized && workbenchState == workspace && workspaceFolderCount != 0 && scmRepositoryCount == 0 && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0 && remoteName != 'codespaces'", + "when": "config.git.enabled && !git.missing && git.state == initialized && workbenchState == workspace && workspaceFolderCount != 0 && scmRepositoryCount == 0 && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0 && git.closedRepositoryCount == 0 && remoteName != 'codespaces'", "group": "5_scm@1" }, { @@ -2913,6 +2979,16 @@ "contents": "%view.workbench.scm.unsafeRepositories%", "when": "config.git.enabled && !git.missing && git.state == initialized && git.unsafeRepositoryCount > 1" }, + { + "view": "scm", + "contents": "%view.workbench.scm.closedRepository%", + "when": "config.git.enabled && !git.missing && git.state == initialized && git.closedRepositoryCount == 1" + }, + { + "view": "scm", + "contents": "%view.workbench.scm.closedRepositories%", + "when": "config.git.enabled && !git.missing && git.state == initialized && git.closedRepositoryCount > 1" + }, { "view": "explorer", "contents": "%view.workbench.cloneRepository%", @@ -2936,14 +3012,14 @@ "jschardet": "3.0.0", "picomatch": "2.3.1", "vscode-uri": "^2.0.0", - "which": "^1.3.0" + "which": "3.0.1" }, "devDependencies": { "@types/byline": "4.2.31", "@types/mocha": "^9.1.1", "@types/node": "16.x", "@types/picomatch": "2.3.0", - "@types/which": "^1.0.28" + "@types/which": "3.0.0" }, "repository": { "type": "git", diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json index 2471b5d9286..24f03414ce6 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json @@ -7,6 +7,7 @@ "command.cloneRecursive": "Clone (Recursive)", "command.init": "Initialize Repository", "command.openRepository": "Open Repository", + "command.reopenClosedRepositories": "Reopen Closed Repositories...", "command.close": "Close Repository", "command.refresh": "Refresh", "command.openChange": "Open Changes", @@ -32,6 +33,8 @@ "command.cleanAllUntracked": "Discard All Untracked Changes", "command.closeAllDiffEditors": "Close All Diff Editors", "command.commit": "Commit", + "command.commitAmend": "Commit (Amend)", + "command.commitSigned": "Commit (Signed Off)", "command.commitStaged": "Commit Staged", "command.commitEmpty": "Commit Empty", "command.commitStagedSigned": "Commit Staged (Signed Off)", @@ -43,6 +46,8 @@ "command.commitStagedNoVerify": "Commit Staged (No Verify)", "command.commitEmptyNoVerify": "Commit Empty (No Verify)", "command.commitStagedSignedNoVerify": "Commit Staged (Signed Off, No Verify)", + "command.commitAmendNoVerify": "Commit (Amend, No Verify)", + "command.commitSignedNoVerify": "Commit (Signed Off, No Verify)", "command.commitStagedAmendNoVerify": "Commit Staged (Amend, No Verify)", "command.commitAllNoVerify": "Commit All (No Verify)", "command.commitAllSignedNoVerify": "Commit All (Signed Off, No Verify)", @@ -131,7 +136,7 @@ "config.checkoutType.local": "Local branches", "config.checkoutType.tags": "Tags", "config.checkoutType.remote": "Remote branches", - "config.defaultBranchName": "The name of the default branch (ex: main, trunk, development) when initializing a new git repository. When set to empty, the default branch name configured in git will be used.", + "config.defaultBranchName": "The name of the default branch (ex: main, trunk, development) when initializing a new git repository. When set to empty, the default branch name configured in git will be used. **Note:** Requires git version `2.28.0` or later.", "config.branchPrefix": "Prefix used when creating a new branch.", "config.branchProtection": "List of protected branches. By default, a prompt is shown before changes are committed to a protected branch. The prompt can be controlled using the `#git.branchProtectionPrompt#` setting.", "config.branchProtectionPrompt": "Controls whether a prompt is being shown before changes are committed to a protected branch.", @@ -252,7 +257,7 @@ "config.publishBeforeContinueOn.always": "Always publish unpublished git state when using Continue Working On from a git repository", "config.publishBeforeContinueOn.never": "Never publish unpublished git state when using Continue Working On from a git repository", "config.publishBeforeContinueOn.prompt": "Prompt to publish unpublished git state when using Continue Working On from a git repository", - "config.similarityThreshold": "Controls the threshold of the similarity index (i.e. amount of additions/deletions compared to the file's size) for changes in a pair of added/deleted files to be considered a rename.", + "config.similarityThreshold": "Controls the threshold of the similarity index (i.e. amount of additions/deletions compared to the file's size) for changes in a pair of added/deleted files to be considered a rename. **Note:** Requires git version `2.18.0` or later.", "submenu.explorer": "Git", "submenu.commit": "Commit", "submenu.commit.amend": "Amend", @@ -378,6 +383,22 @@ "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" ] }, + "view.workbench.scm.closedRepository": { + "message": "A git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "comment": [ + "{Locked='](command:git.reopenClosedRepositories'}", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" + ] + }, + "view.workbench.scm.closedRepositories": { + "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "comment": [ + "{Locked='](command:git.reopenClosedRepositories'}", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" + ] + }, "view.workbench.cloneRepository": { "message": "You can clone a repository locally.\n[Clone Repository](command:git.clone 'Clone a repository once the git extension has activated')", "comment": [ diff --git a/extensions/git/resources/icons/dark/status-type-changed.svg b/extensions/git/resources/icons/dark/status-type-changed.svg new file mode 100644 index 00000000000..ae504ae1881 --- /dev/null +++ b/extensions/git/resources/icons/dark/status-type-changed.svg @@ -0,0 +1,6 @@ + + + + T + + diff --git a/extensions/git/resources/icons/light/status-type-changed.svg b/extensions/git/resources/icons/light/status-type-changed.svg new file mode 100644 index 00000000000..ae504ae1881 --- /dev/null +++ b/extensions/git/resources/icons/light/status-type-changed.svg @@ -0,0 +1,6 @@ + + + + T + + diff --git a/extensions/git/src/actionButton.ts b/extensions/git/src/actionButton.ts index e0524d9dff6..6b99a2a967a 100644 --- a/extensions/git/src/actionButton.ts +++ b/extensions/git/src/actionButton.ts @@ -126,7 +126,7 @@ export class ActionButtonCommand { const commandGroups: Command[][] = []; for (const commands of this.postCommitCommandCenter.getSecondaryCommands()) { commandGroups.push(commands.map(c => { - return { command: 'git.commit', title: c.title, tooltip: c.tooltip, arguments: c.arguments }; + return { command: c.command, title: c.title, tooltip: c.tooltip, arguments: c.arguments }; })); } diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts index e1fcc022aa6..afa4ad1bcaf 100644 --- a/extensions/git/src/api/api1.ts +++ b/extensions/git/src/api/api1.ts @@ -5,7 +5,7 @@ import { Model } from '../model'; import { Repository as BaseRepository, Resource } from '../repository'; -import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent, FetchOptions, RemoteSourceProvider, RemoteSourcePublisher, PostCommitCommandsProvider, RefQuery, BranchProtectionProvider } from './git'; +import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent, FetchOptions, RemoteSourceProvider, RemoteSourcePublisher, PostCommitCommandsProvider, RefQuery, BranchProtectionProvider, InitOptions } from './git'; import { Event, SourceControlInputBox, Uri, SourceControl, Disposable, commands, CancellationToken } from 'vscode'; import { combinedDisposable, mapEvent } from '../util'; import { toGitUri } from '../uri'; @@ -294,9 +294,9 @@ export class ApiImpl implements API { return result ? new ApiRepository(result) : null; } - async init(root: Uri): Promise { + async init(root: Uri, options?: InitOptions): Promise { const path = root.fsPath; - await this._model.git.init(path); + await this._model.git.init(path, options); await this._model.openRepository(path); return this.getRepository(root) || null; } @@ -362,6 +362,8 @@ function getStatus(status: Status): string { case Status.UNTRACKED: return 'UNTRACKED'; case Status.IGNORED: return 'IGNORED'; case Status.INTENT_TO_ADD: return 'INTENT_TO_ADD'; + case Status.INTENT_TO_RENAME: return 'INTENT_TO_RENAME'; + case Status.TYPE_CHANGED: return 'TYPE_CHANGED'; case Status.ADDED_BY_US: return 'ADDED_BY_US'; case Status.ADDED_BY_THEM: return 'ADDED_BY_THEM'; case Status.DELETED_BY_US: return 'DELETED_BY_US'; diff --git a/extensions/git/src/api/git-base.d.ts b/extensions/git/src/api/git-base.d.ts index dca68d13071..1eeb1739901 100644 --- a/extensions/git/src/api/git-base.d.ts +++ b/extensions/git/src/api/git-base.d.ts @@ -8,6 +8,7 @@ export { ProviderResult } from 'vscode'; export interface API { pickRemoteSource(options: PickRemoteSourceOptions): Promise; + getRemoteSourceActions(url: string): Promise; registerRemoteSourceProvider(provider: RemoteSourceProvider): Disposable; } @@ -31,9 +32,12 @@ export interface GitBaseExtension { export interface PickRemoteSourceOptions { readonly providerLabel?: (provider: RemoteSourceProvider) => string; - readonly urlLabel?: string; + readonly urlLabel?: string | ((url: string) => string); readonly providerName?: string; + readonly title?: string; + readonly placeholder?: string; readonly branch?: boolean; // then result is PickRemoteSourceResult + readonly showRecentSources?: boolean; } export interface PickRemoteSourceResult { @@ -41,20 +45,42 @@ export interface PickRemoteSourceResult { readonly branch?: string; } +export interface RemoteSourceAction { + readonly label: string; + /** + * Codicon name + */ + readonly icon: string; + run(branch: string): void; +} + export interface RemoteSource { readonly name: string; readonly description?: string; + readonly detail?: string; + /** + * Codicon name + */ + readonly icon?: string; readonly url: string | string[]; } +export interface RecentRemoteSource extends RemoteSource { + readonly timestamp: number; +} + export interface RemoteSourceProvider { readonly name: string; /** * Codicon name */ readonly icon?: string; + readonly label?: string; + readonly placeholder?: string; readonly supportsQuery?: boolean; getBranches?(url: string): ProviderResult; + getRemoteSourceActions?(url: string): ProviderResult; + getRecentRemoteSources?(query?: string): ProviderResult; getRemoteSources(query?: string): ProviderResult; } diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts index e3ec7c1000d..ae1d57d3098 100644 --- a/extensions/git/src/api/git.d.ts +++ b/extensions/git/src/api/git.d.ts @@ -78,6 +78,8 @@ export const enum Status { UNTRACKED, IGNORED, INTENT_TO_ADD, + INTENT_TO_RENAME, + TYPE_CHANGED, ADDED_BY_US, ADDED_BY_THEM, @@ -156,6 +158,10 @@ export interface FetchOptions { depth?: number; } +export interface InitOptions { + defaultBranch?: string; +} + export interface RefQuery { readonly contains?: string; readonly count?: number; @@ -307,7 +313,7 @@ export interface API { toGitUri(uri: Uri, ref: string): Uri; getRepository(uri: Uri): Repository | null; - init(root: Uri): Promise; + init(root: Uri, options?: InitOptions): Promise; openRepository(root: Uri): Promise registerRemoteSourcePublisher(publisher: RemoteSourcePublisher): Disposable; diff --git a/extensions/git/src/askpass.ts b/extensions/git/src/askpass.ts index ffd299bfdf3..7821ce112e8 100644 --- a/extensions/git/src/askpass.ts +++ b/extensions/git/src/askpass.ts @@ -18,6 +18,8 @@ export class Askpass implements IIPCHandler, ITerminalEnvironmentProvider { private cache = new Map(); private credentialsProviders = new Set(); + readonly featureDescription = 'git auth provider'; + constructor(private ipc?: IIPCServer) { if (ipc) { this.disposable = ipc.registerHandler('askpass', this); diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index 624e9d2353c..8eba9cbac03 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -5,7 +5,7 @@ import * as os from 'os'; import * as path from 'path'; -import { Command, commands, Disposable, LineChange, MessageOptions, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge, QuickPickItemKind, TextDocument, LogOutputChannel, l10n, Memento, UIKind } from 'vscode'; +import { Command, commands, Disposable, LineChange, MessageOptions, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge, QuickPickItemKind, TextDocument, LogOutputChannel, l10n, Memento, UIKind, QuickInputButton, ThemeIcon } from 'vscode'; import TelemetryReporter from '@vscode/extension-telemetry'; import { uniqueNamesGenerator, adjectives, animals, colors, NumberDictionary } from '@joaomoreno/unique-names-generator'; import { Branch, ForcePushMode, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourcePublisher, Remote } from './api/git'; @@ -17,7 +17,8 @@ import { fromGitUri, toGitUri, isGitUri, toMergeUris } from './uri'; import { grep, isDescendant, pathEquals, relativePath } from './util'; import { GitTimelineItem } from './timelineProvider'; import { ApiRepository } from './api/api1'; -import { pickRemoteSource } from './remoteSource'; +import { getRemoteSourceActions, pickRemoteSource } from './remoteSource'; +import { RemoteSourceAction } from './api/git-base'; class CheckoutItem implements QuickPickItem { @@ -25,8 +26,11 @@ class CheckoutItem implements QuickPickItem { get label(): string { return `${this.repository.isBranchProtected(this.ref) ? '$(lock)' : '$(git-branch)'} ${this.ref.name || this.shortCommit}`; } get description(): string { return this.shortCommit; } get refName(): string | undefined { return this.ref.name; } + get refRemote(): string | undefined { return this.ref.remote; } + get buttons(): QuickInputButton[] | undefined { return this._buttons; } + set buttons(newButtons: QuickInputButton[] | undefined) { this._buttons = newButtons; } - constructor(protected repository: Repository, protected ref: Ref) { } + constructor(protected repository: Repository, protected ref: Ref, protected _buttons?: QuickInputButton[]) { } async run(opts?: { detached?: boolean }): Promise { if (!this.ref.name) { @@ -192,9 +196,9 @@ class FetchAllRemotesItem implements QuickPickItem { } class RepositoryItem implements QuickPickItem { - get label(): string { - return `$(repo) ${this.path}`; - } + get label(): string { return `$(repo) ${getRepositoryLabel(this.path)}`; } + + get description(): string { return this.path; } constructor(public readonly path: string) { } } @@ -278,7 +282,54 @@ async function createCheckoutItems(repository: Repository, detached = false): Pr } } - return processors.reduce((r, p) => r.concat(...p.items), []); + const buttons = await getRemoteRefItemButtons(repository); + let fallbackRemoteButtons: RemoteSourceActionButton[] | undefined = []; + const remote = repository.remotes.find(r => r.pushUrl === repository.HEAD?.remote || r.fetchUrl === repository.HEAD?.remote) ?? repository.remotes[0]; + const remoteUrl = remote?.pushUrl ?? remote?.fetchUrl; + if (remoteUrl) { + fallbackRemoteButtons = buttons.get(remoteUrl); + } + + return processors.reduce((r, p) => r.concat(...p.items.map((item) => { + if (item.refRemote) { + const matchingRemote = repository.remotes.find((remote) => remote.name === item.refRemote); + const remoteUrl = matchingRemote?.pushUrl ?? matchingRemote?.fetchUrl; + if (remoteUrl) { + item.buttons = buttons.get(item.refRemote); + } + } + + item.buttons = fallbackRemoteButtons; + return item; + })), []); +} + +type RemoteSourceActionButton = { + iconPath: ThemeIcon; + tooltip: string; + actual: RemoteSourceAction; +}; + +async function getRemoteRefItemButtons(repository: Repository) { + // Compute actions for all known remotes + const remoteUrlsToActions = new Map(); + + const getButtons = async (remoteUrl: string) => (await getRemoteSourceActions(remoteUrl)).map((action) => ({ iconPath: new ThemeIcon(action.icon), tooltip: action.label, actual: action })); + + for (const remote of repository.remotes) { + if (remote.fetchUrl) { + const actions = remoteUrlsToActions.get(remote.fetchUrl) ?? []; + actions.push(...await getButtons(remote.fetchUrl)); + remoteUrlsToActions.set(remote.fetchUrl, actions); + } + if (remote.pushUrl && remote.pushUrl !== remote.fetchUrl) { + const actions = remoteUrlsToActions.get(remote.pushUrl) ?? []; + actions.push(...await getButtons(remote.pushUrl)); + remoteUrlsToActions.set(remote.pushUrl, actions); + } + } + + return remoteUrlsToActions; } class CheckoutProcessor { @@ -307,6 +358,15 @@ function getCheckoutProcessor(repository: Repository, type: string): CheckoutPro return undefined; } +function getRepositoryLabel(repositoryRoot: string): string { + const workspaceFolder = workspace.getWorkspaceFolder(Uri.file(repositoryRoot)); + return workspaceFolder?.uri.toString() === repositoryRoot ? workspaceFolder.name : path.basename(repositoryRoot); +} + +function compareRepositoryLabel(repositoryRoot1: string, repositoryRoot2: string): number { + return getRepositoryLabel(repositoryRoot1).localeCompare(getRepositoryLabel(repositoryRoot2)); +} + function sanitizeBranchName(name: string, whitespaceChar: string): string { return name ? name.trim().replace(/^-+/, '').replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, whitespaceChar) : name; } @@ -690,15 +750,22 @@ export class CommandCenter { if (uri !== undefined) { // Launch desktop client if currently in web + let target = `${env.uriScheme}://vscode.git/clone?url=${encodeURIComponent(uri)}`; if (env.uiKind === UIKind.Web) { - let target = `${env.uriScheme}://vscode.git/clone?url=${encodeURIComponent(uri)}`; if (ref !== undefined) { target += `&ref=${encodeURIComponent(ref)}`; } return Uri.parse(target); } - // If already in desktop client, directly clone + // If already in desktop client but in a remote window, we need to force a new window + // so that the git extension can access the local filesystem for cloning + if (env.remoteName !== undefined) { + target += `&windowId=_blank`; + return Uri.parse(target); + } + + // Otherwise, directly clone void this.clone(uri, undefined, { ref: ref }); } } @@ -829,7 +896,44 @@ export class CommandCenter { path = result[0].fsPath; } - await this.model.openRepository(path); + await this.model.openRepository(path, true); + } + + @command('git.reopenClosedRepositories', { repository: false }) + async reopenClosedRepositories(): Promise { + if (this.model.closedRepositories.length === 0) { + return; + } + + const closedRepositories: string[] = []; + + const title = l10n.t('Reopen Closed Repositories'); + const placeHolder = l10n.t('Pick a repository to reopen'); + + const allRepositoriesLabel = l10n.t('All Repositories'); + const allRepositoriesQuickPickItem: QuickPickItem = { label: allRepositoriesLabel }; + const repositoriesQuickPickItems: QuickPickItem[] = this.model.closedRepositories + .sort(compareRepositoryLabel).map(r => new RepositoryItem(r)); + + const items = this.model.closedRepositories.length === 1 ? [...repositoriesQuickPickItems] : + [...repositoriesQuickPickItems, { label: '', kind: QuickPickItemKind.Separator }, allRepositoriesQuickPickItem]; + + const repositoryItem = await window.showQuickPick(items, { title, placeHolder }); + if (!repositoryItem) { + return; + } + + if (repositoryItem === allRepositoriesQuickPickItem) { + // All Repositories + closedRepositories.push(...this.model.closedRepositories.values()); + } else { + // One Repository + closedRepositories.push((repositoryItem as RepositoryItem).path); + } + + for (const repository of closedRepositories) { + await this.model.openRepository(repository, true); + } } @command('git.close', { repository: true }) @@ -1869,6 +1973,16 @@ export class CommandCenter { await this.commitWithAnyInput(repository, { postCommitCommand }); } + @command('git.commitAmend', { repository: true }) + async commitAmend(repository: Repository): Promise { + await this.commitWithAnyInput(repository, { amend: true }); + } + + @command('git.commitSigned', { repository: true }) + async commitSigned(repository: Repository): Promise { + await this.commitWithAnyInput(repository, { signoff: true }); + } + @command('git.commitStaged', { repository: true }) async commitStaged(repository: Repository): Promise { await this.commitWithAnyInput(repository, { all: false }); @@ -1987,6 +2101,16 @@ export class CommandCenter { await this.commitWithAnyInput(repository, { all: false, signoff: true, noVerify: true }); } + @command('git.commitAmendNoVerify', { repository: true }) + async commitAmendNoVerify(repository: Repository): Promise { + await this.commitWithAnyInput(repository, { amend: true, noVerify: true }); + } + + @command('git.commitSignedNoVerify', { repository: true }) + async commitSignedNoVerify(repository: Repository): Promise { + await this.commitWithAnyInput(repository, { signoff: true, noVerify: true }); + } + @command('git.commitStagedAmendNoVerify', { repository: true }) async commitStagedAmendNoVerify(repository: Repository): Promise { await this.commitWithAnyInput(repository, { all: false, amend: true, noVerify: true }); @@ -2084,7 +2208,17 @@ export class CommandCenter { quickpick.items = picks; quickpick.busy = false; - const choice = await new Promise(c => quickpick.onDidAccept(() => c(quickpick.activeItems[0]))); + const choice = await new Promise(c => { + quickpick.onDidAccept(() => c(quickpick.activeItems[0])); + quickpick.onDidTriggerItemButton((e) => { + quickpick.hide(); + const button = e.button as QuickInputButton & { actual: RemoteSourceAction }; + const item = e.item as CheckoutItem; + if (button.actual && item.refName) { + button.actual.run(item.refRemote ? item.refName.substring(item.refRemote.length + 1) : item.refName); + } + }); + }); quickpick.hide(); if (!choice) { @@ -3362,9 +3496,10 @@ export class CommandCenter { const allRepositoriesLabel = l10n.t('All Repositories'); const allRepositoriesQuickPickItem: QuickPickItem = { label: allRepositoriesLabel }; - const repositoriesQuickPickItems: QuickPickItem[] = Array.from(this.model.parentRepositories.keys()).sort().map(r => new RepositoryItem(r)); + const repositoriesQuickPickItems: QuickPickItem[] = this.model.parentRepositories + .sort(compareRepositoryLabel).map(r => new RepositoryItem(r)); - const items = this.model.parentRepositories.size === 1 ? [...repositoriesQuickPickItems] : + const items = this.model.parentRepositories.length === 1 ? [...repositoriesQuickPickItems] : [...repositoriesQuickPickItems, { label: '', kind: QuickPickItemKind.Separator }, allRepositoriesQuickPickItem]; const repositoryItem = await window.showQuickPick(items, { title, placeHolder }); @@ -3374,7 +3509,7 @@ export class CommandCenter { if (repositoryItem === allRepositoriesQuickPickItem) { // All Repositories - parentRepositories.push(...this.model.parentRepositories.keys()); + parentRepositories.push(...this.model.parentRepositories); } else { // One Repository parentRepositories.push((repositoryItem as RepositoryItem).path); @@ -3395,9 +3530,10 @@ export class CommandCenter { const allRepositoriesLabel = l10n.t('All Repositories'); const allRepositoriesQuickPickItem: QuickPickItem = { label: allRepositoriesLabel }; - const repositoriesQuickPickItems: QuickPickItem[] = Array.from(this.model.unsafeRepositories.keys()).sort().map(r => new RepositoryItem(r)); + const repositoriesQuickPickItems: QuickPickItem[] = this.model.unsafeRepositories + .sort(compareRepositoryLabel).map(r => new RepositoryItem(r)); - quickpick.items = this.model.unsafeRepositories.size === 1 ? [...repositoriesQuickPickItems] : + quickpick.items = this.model.unsafeRepositories.length === 1 ? [...repositoriesQuickPickItems] : [...repositoriesQuickPickItems, { label: '', kind: QuickPickItemKind.Separator }, allRepositoriesQuickPickItem]; quickpick.show(); @@ -3414,7 +3550,7 @@ export class CommandCenter { if (repositoryItem.label === allRepositoriesLabel) { // All Repositories - unsafeRepositories.push(...this.model.unsafeRepositories.keys()); + unsafeRepositories.push(...this.model.unsafeRepositories); } else { // One Repository unsafeRepositories.push((repositoryItem as RepositoryItem).path); @@ -3422,11 +3558,11 @@ export class CommandCenter { for (const unsafeRepository of unsafeRepositories) { // Mark as Safe - await this.git.addSafeDirectory(this.model.unsafeRepositories.get(unsafeRepository)!); + await this.git.addSafeDirectory(this.model.getUnsafeRepositoryPath(unsafeRepository)!); // Open Repository await this.model.openRepository(unsafeRepository); - this.model.unsafeRepositories.delete(unsafeRepository); + this.model.deleteUnsafeRepository(unsafeRepository); } } diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts index 7c8ee74043c..c630f00c712 100644 --- a/extensions/git/src/decorationProvider.ts +++ b/extensions/git/src/decorationProvider.ts @@ -131,7 +131,7 @@ class GitDecorationProvider implements FileDecorationProvider { bucket.set(r.rightUri.toString(), decoration); } - if (r.type === Status.INDEX_RENAMED) { + if (r.type === Status.INDEX_RENAMED || r.type === Status.INTENT_TO_RENAME) { bucket.set(r.resourceUri.toString(), decoration); } } diff --git a/extensions/git/src/editSessionIdentityProvider.ts b/extensions/git/src/editSessionIdentityProvider.ts index 10ebbf349e4..6a0a31774a1 100644 --- a/extensions/git/src/editSessionIdentityProvider.ts +++ b/extensions/git/src/editSessionIdentityProvider.ts @@ -35,7 +35,7 @@ export class GitEditSessionIdentityProvider implements vscode.EditSessionIdentit } const remoteUrl = repository.remotes.find((remote) => remote.name === repository.HEAD?.upstream?.remote)?.pushUrl?.replace(/^(git@[^\/:]+)(:)/i, 'ssh://$1/'); - const remote = remoteUrl ? await vscode.workspace.provideCanonicalUriIdentity(vscode.Uri.parse(remoteUrl), token) : null; + const remote = remoteUrl ? await vscode.workspace.getCanonicalUri(vscode.Uri.parse(remoteUrl), { targetScheme: 'https' }, token) : null; return JSON.stringify({ remote: remote?.toString() ?? remoteUrl, diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts index 1fe5a80dba4..ab03a354d11 100644 --- a/extensions/git/src/git.ts +++ b/extensions/git/src/git.ts @@ -12,10 +12,10 @@ import * as which from 'which'; import { EventEmitter } from 'events'; import * as iconv from '@vscode/iconv-lite-umd'; import * as filetype from 'file-type'; -import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter, Versions, isWindows, pathEquals } from './util'; +import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter, Versions, isWindows, pathEquals, isMacintosh, isDescendant } from './util'; import { CancellationError, CancellationToken, ConfigurationChangeEvent, LogOutputChannel, Progress, Uri, workspace } from 'vscode'; import { detectEncoding } from './encoding'; -import { Ref, RefType, Branch, Remote, ForcePushMode, GitErrorCodes, LogOptions, Change, Status, CommitOptions, RefQuery } from './api/git'; +import { Ref, RefType, Branch, Remote, ForcePushMode, GitErrorCodes, LogOptions, Change, Status, CommitOptions, RefQuery, InitOptions } from './api/git'; import * as byline from 'byline'; import { StringDecoder } from 'string_decoder'; @@ -73,7 +73,7 @@ function findSpecificGit(path: string, onValidate: (path: string) => boolean): P const child = cp.spawn(path, ['--version']); child.stdout.on('data', (b: Buffer) => buffers.push(b)); child.on('error', cpErrorHandler(e)); - child.on('exit', code => code ? e(new Error('Not found')) : c({ path, version: parseVersion(Buffer.concat(buffers).toString('utf8').trim()) })); + child.on('close', code => code ? e(new Error('Not found')) : c({ path, version: parseVersion(Buffer.concat(buffers).toString('utf8').trim()) })); }); } @@ -129,9 +129,9 @@ function findSystemGitWin32(base: string, onValidate: (path: string) => boolean) return findSpecificGit(path.join(base, 'Git', 'cmd', 'git.exe'), onValidate); } -function findGitWin32InPath(onValidate: (path: string) => boolean): Promise { - const whichPromise = new Promise((c, e) => which('git.exe', (err, path) => err ? e(err) : c(path))); - return whichPromise.then(path => findSpecificGit(path, onValidate)); +async function findGitWin32InPath(onValidate: (path: string) => boolean): Promise { + const path = await which('git.exe'); + return findSpecificGit(path, onValidate); } function findGitWin32(onValidate: (path: string) => boolean): Promise { @@ -401,10 +401,10 @@ export class Git { return new Repository(this, repository, dotGit, logger); } - async init(repository: string, options: { defaultBranch?: string } = {}): Promise { + async init(repository: string, options: InitOptions = {}): Promise { const args = ['init']; - if (options.defaultBranch && options.defaultBranch !== '') { + if (options.defaultBranch && options.defaultBranch !== '' && this.compareGitVersionTo('2.28.0') !== -1) { args.push('-b', options.defaultBranch); } @@ -477,18 +477,18 @@ export class Git { return folderPath; } - async getRepositoryRoot(repositoryPath: string): Promise { - const result = await this.exec(repositoryPath, ['rev-parse', '--show-toplevel']); + async getRepositoryRoot(pathInsidePossibleRepository: string): Promise { + const result = await this.exec(pathInsidePossibleRepository, ['rev-parse', '--show-toplevel']); // Keep trailing spaces which are part of the directory name - const repoPath = path.normalize(result.stdout.trimLeft().replace(/[\r\n]+$/, '')); + const repositoryRootPath = path.normalize(result.stdout.trimLeft().replace(/[\r\n]+$/, '')); if (isWindows) { // On Git 2.25+ if you call `rev-parse --show-toplevel` on a mapped drive, instead of getting the mapped // drive path back, you get the UNC path for the mapped drive. So we will try to normalize it back to the // mapped drive path, if possible - const repoUri = Uri.file(repoPath); - const pathUri = Uri.file(repositoryPath); + const repoUri = Uri.file(repositoryRootPath); + const pathUri = Uri.file(pathInsidePossibleRepository); if (repoUri.authority.length !== 0 && pathUri.authority.length === 0) { // eslint-disable-next-line local/code-no-look-behind-regex const match = /(?<=^\/?)([a-zA-Z])(?=:\/)/.exec(pathUri.path); @@ -520,7 +520,18 @@ export class Git { } } - return repoPath; + // Handle symbolic links + // Git 2.31 added the `--path-format` flag to rev-parse which + // allows us to get the relative path of the repository root + if (!pathEquals(pathInsidePossibleRepository, repositoryRootPath) && + !isDescendant(repositoryRootPath, pathInsidePossibleRepository) && + !isDescendant(pathInsidePossibleRepository, repositoryRootPath) && + this.compareGitVersionTo('2.31.0') !== -1) { + const relativePathResult = await this.exec(pathInsidePossibleRepository, ['rev-parse', '--path-format=relative', '--show-toplevel',]); + return path.resolve(pathInsidePossibleRepository, relativePathResult.stdout.trimLeft().replace(/[\r\n]+$/, '')); + } + + return repositoryRootPath; } async getRepositoryDotGit(repositoryPath: string): Promise<{ path: string; commonPath?: string }> { @@ -793,7 +804,7 @@ export class GitStatusParser { // space i++; - if (entry.x === 'R' || entry.x === 'C') { + if (entry.x === 'R' || entry.y === 'R' || entry.x === 'C') { lastIndex = raw.indexOf('\0', i); if (lastIndex === -1) { @@ -2021,7 +2032,7 @@ export class Repository { } // --find-renames option is only available starting with git 2.18.0 - if (opts?.similarityThreshold && this._git.compareGitVersionTo('2.18.0') !== -1) { + if (opts?.similarityThreshold && opts.similarityThreshold !== 50 && this._git.compareGitVersionTo('2.18.0') !== -1) { args.push(`--find-renames=${opts.similarityThreshold}%`); } @@ -2352,6 +2363,13 @@ export class Repository { args.push('--format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track)%00%(upstream:remotename)%00%(upstream:remoteref)'); } + // On Windows and macOS ref names are case insensitive so we add --ignore-case + // to handle the scenario where the user switched to a branch with incorrect + // casing + if (isWindows || isMacintosh) { + args.push('--ignore-case'); + } + if (/^refs\/(head|remotes)\//i.test(name)) { args.push(name); } else { diff --git a/extensions/git/src/gitEditor.ts b/extensions/git/src/gitEditor.ts index fb0688e4401..f43e6f68209 100644 --- a/extensions/git/src/gitEditor.ts +++ b/extensions/git/src/gitEditor.ts @@ -17,6 +17,8 @@ export class GitEditor implements IIPCHandler, ITerminalEnvironmentProvider { private env: { [key: string]: string }; private disposable: IDisposable = EmptyDisposable; + readonly featureDescription = 'git editor'; + constructor(ipc?: IIPCServer) { if (ipc) { this.disposable = ipc.registerHandler('git-editor', this); diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts index 54b86c843dc..7c93979ee69 100644 --- a/extensions/git/src/main.ts +++ b/extensions/git/src/main.ts @@ -86,7 +86,7 @@ async function createModel(context: ExtensionContext, logger: LogOutputChannel, version: info.version, env: environment, }); - const model = new Model(git, askpass, context.globalState, logger, telemetryReporter); + const model = new Model(git, askpass, context.globalState, context.workspaceState, logger, telemetryReporter); disposables.push(model); const onRepository = () => commands.executeCommand('setContext', 'gitOpenRepositoryCount', `${model.repositories.length}`); diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts index 360f8401507..eacfca8f035 100644 --- a/extensions/git/src/model.ts +++ b/extensions/git/src/model.ts @@ -34,50 +34,6 @@ class RepositoryPick implements QuickPickItem { constructor(public readonly repository: Repository, public readonly index: number) { } } -abstract class RepositoryMap extends Map { - constructor() { - super(); - this.updateContextKey(); - } - - override set(key: string, value: T): this { - const result = super.set(key, value); - this.updateContextKey(); - - return result; - } - - override delete(key: string): boolean { - const result = super.delete(key); - this.updateContextKey(); - - return result; - } - - abstract updateContextKey(): void; -} - -/** - * Key - normalized path used in user interface - * Value - path extracted from the output of the `git status` command - * used when calling `git config --global --add safe.directory` - */ -class UnsafeRepositoryMap extends RepositoryMap { - updateContextKey(): void { - commands.executeCommand('setContext', 'git.unsafeRepositoryCount', this.size); - } -} - -/** - * Key - normalized path used in user interface - * Value - value indicating whether the repository should be opened - */ -class ParentRepositoryMap extends RepositoryMap { - updateContextKey(): void { - commands.executeCommand('setContext', 'git.parentRepositoryCount', this.size); - } -} - export interface ModelChangeEvent { repository: Repository; uri: Uri; @@ -92,6 +48,128 @@ interface OpenRepository extends Disposable { repository: Repository; } +class ClosedRepositoriesManager { + + private _repositories: Set; + get repositories(): string[] { + return [...this._repositories.values()]; + } + + constructor(private readonly workspaceState: Memento) { + this._repositories = new Set(workspaceState.get('closedRepositories', [])); + this.onDidChangeRepositories(); + } + + addRepository(repository: string): void { + this._repositories.add(repository); + this.onDidChangeRepositories(); + } + + deleteRepository(repository: string): boolean { + const result = this._repositories.delete(repository); + if (result) { + this.onDidChangeRepositories(); + } + + return result; + } + + isRepositoryClosed(repository: string): boolean { + return this._repositories.has(repository); + } + + private onDidChangeRepositories(): void { + this.workspaceState.update('closedRepositories', [...this._repositories.values()]); + commands.executeCommand('setContext', 'git.closedRepositoryCount', this._repositories.size); + } +} + +class ParentRepositoriesManager { + + /** + * Key - normalized path used in user interface + * Value - value indicating whether the repository should be opened + */ + private _repositories = new Set; + get repositories(): string[] { + return [...this._repositories.values()]; + } + + constructor(private readonly globalState: Memento) { + this.onDidChangeRepositories(); + } + + addRepository(repository: string): void { + this._repositories.add(repository); + this.onDidChangeRepositories(); + } + + deleteRepository(repository: string): boolean { + const result = this._repositories.delete(repository); + if (result) { + this.onDidChangeRepositories(); + } + + return result; + } + + hasRepository(repository: string): boolean { + return this._repositories.has(repository); + } + + openRepository(repository: string): void { + this.globalState.update(`parentRepository:${repository}`, true); + this.deleteRepository(repository); + } + + private onDidChangeRepositories(): void { + commands.executeCommand('setContext', 'git.parentRepositoryCount', this._repositories.size); + } +} + +class UnsafeRepositoriesManager { + + /** + * Key - normalized path used in user interface + * Value - path extracted from the output of the `git status` command + * used when calling `git config --global --add safe.directory` + */ + private _repositories = new Map(); + get repositories(): string[] { + return [...this._repositories.keys()]; + } + + constructor() { + this.onDidChangeRepositories(); + } + + addRepository(repository: string, path: string): void { + this._repositories.set(repository, path); + this.onDidChangeRepositories(); + } + + deleteRepository(repository: string): boolean { + const result = this._repositories.delete(repository); + if (result) { + this.onDidChangeRepositories(); + } + + return result; + } + + getRepositoryPath(repository: string): string | undefined { + return this._repositories.get(repository); + } + + hasRepository(repository: string): boolean { + return this._repositories.has(repository); + } + + private onDidChangeRepositories(): void { + commands.executeCommand('setContext', 'git.unsafeRepositoryCount', this._repositories.size); + } +} + export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePublisherRegistry, IPostCommitCommandsProviderRegistry, IPushErrorHandlerRegistry { private _onDidOpenRepository = new EventEmitter(); @@ -159,14 +237,19 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu private pushErrorHandlers = new Set(); - private _unsafeRepositories = new UnsafeRepositoryMap(); - get unsafeRepositories(): UnsafeRepositoryMap { - return this._unsafeRepositories; + private _unsafeRepositoriesManager: UnsafeRepositoriesManager; + get unsafeRepositories(): string[] { + return this._unsafeRepositoriesManager.repositories; } - private _parentRepositories = new ParentRepositoryMap(); - get parentRepositories(): ParentRepositoryMap { - return this._parentRepositories; + private _parentRepositoriesManager: ParentRepositoriesManager; + get parentRepositories(): string[] { + return this._parentRepositoriesManager.repositories; + } + + private _closedRepositoriesManager: ClosedRepositoriesManager; + get closedRepositories(): string[] { + return [...this._closedRepositoriesManager.repositories]; } /** @@ -181,7 +264,12 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu private disposables: Disposable[] = []; - constructor(readonly git: Git, private readonly askpass: Askpass, private globalState: Memento, private logger: LogOutputChannel, private telemetryReporter: TelemetryReporter) { + constructor(readonly git: Git, private readonly askpass: Askpass, private globalState: Memento, readonly workspaceState: Memento, private logger: LogOutputChannel, private telemetryReporter: TelemetryReporter) { + // Repositories managers + this._closedRepositoriesManager = new ClosedRepositoriesManager(workspaceState); + this._parentRepositoriesManager = new ParentRepositoriesManager(globalState); + this._unsafeRepositoriesManager = new UnsafeRepositoriesManager(); + workspace.onDidChangeWorkspaceFolders(this.onDidChangeWorkspaceFolders, this, this.disposables); window.onDidChangeVisibleTextEditors(this.onDidChangeVisibleTextEditors, this, this.disposables); workspace.onDidChangeConfiguration(this.onDidChangeConfiguration, this, this.disposables); @@ -216,11 +304,11 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu await initialScanFn(); } - if (this._parentRepositories.size !== 0 && + if (this.parentRepositories.length !== 0 && parentRepositoryConfig === 'prompt') { // Parent repositories notification this.showParentRepositoryNotification(); - } else if (this._unsafeRepositories.size !== 0) { + } else if (this.unsafeRepositories.length !== 0) { // Unsafe repositories notification this.showUnsafeRepositoryNotification(); } @@ -403,10 +491,11 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu } @sequentialize - async openRepository(repoPath: string): Promise { + async openRepository(repoPath: string, openIfClosed = false): Promise { this.logger.trace(`Opening repository: ${repoPath}`); - if (this.getRepositoryExact(repoPath)) { - this.logger.trace(`Repository for path ${repoPath} already exists`); + const existingRepository = await this.getRepositoryExact(repoPath); + if (existingRepository) { + this.logger.trace(`Repository for path ${repoPath} already exists: ${existingRepository.root})`); return; } @@ -436,8 +525,9 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu const { repositoryRoot, unsafeRepositoryMatch } = await this.getRepositoryRoot(repoPath); this.logger.trace(`Repository root for path ${repoPath} is: ${repositoryRoot}`); - if (this.getRepositoryExact(repositoryRoot)) { - this.logger.trace(`Repository for path ${repositoryRoot} already exists`); + const existingRepository = await this.getRepositoryExact(repositoryRoot); + if (existingRepository) { + this.logger.trace(`Repository for path ${repositoryRoot} already exists: ${existingRepository.root}`); return; } @@ -453,13 +543,13 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu if (isRepositoryOutsideWorkspace) { this.logger.trace(`Repository in parent folder: ${repositoryRoot}`); - if (!this._parentRepositories.has(repositoryRoot)) { + if (!this._parentRepositoriesManager.hasRepository(repositoryRoot)) { // Show a notification if the parent repository is opened after the initial scan if (this.state === 'initialized' && parentRepositoryConfig === 'prompt') { this.showParentRepositoryNotification(); } - this._parentRepositories.set(repositoryRoot); + this._parentRepositoriesManager.addRepository(repositoryRoot); } return; @@ -471,21 +561,31 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu this.logger.trace(`Unsafe repository: ${repositoryRoot}`); // Show a notification if the unsafe repository is opened after the initial scan - if (this._state === 'initialized' && !this._unsafeRepositories.has(repositoryRoot)) { + if (this._state === 'initialized' && !this._unsafeRepositoriesManager.hasRepository(repositoryRoot)) { this.showUnsafeRepositoryNotification(); } - this._unsafeRepositories.set(repositoryRoot, unsafeRepositoryMatch[2]); + this._unsafeRepositoriesManager.addRepository(repositoryRoot, unsafeRepositoryMatch[2]); return; } + // Handle repositories that were closed by the user + if (!openIfClosed && this._closedRepositoriesManager.isRepositoryClosed(repositoryRoot)) { + this.logger.trace(`Repository for path ${repositoryRoot} is closed`); + return; + } + // Open repository const dotGit = await this.git.getRepositoryDotGit(repositoryRoot); const repository = new Repository(this.git.open(repositoryRoot, dotGit, this.logger), this, this, this, this, this.globalState, this.logger, this.telemetryReporter); this.open(repository); - repository.status(); // do not await this, we want SCM to know about the repo asap + this._closedRepositoriesManager.deleteRepository(repository.root); + + // Do not await this, we want SCM + // to know about the repo asap + repository.status(); } catch (err) { // noop this.logger.trace(`Opening repository for path='${repoPath}' failed; ex=${err}`); @@ -493,11 +593,8 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu } async openParentRepository(repoPath: string): Promise { - // Mark the repository to be opened from the parent folders - this.globalState.update(`parentRepository:${repoPath}`, true); - await this.openRepository(repoPath); - this.parentRepositories.delete(repoPath); + this._parentRepositoriesManager.openRepository(repoPath); } private async getRepositoryRoot(repoPath: string): Promise<{ repositoryRoot: string; unsafeRepositoryMatch: RegExpMatchArray | null }> { @@ -633,6 +730,8 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu } this.logger.info(`Close repository: ${repository.root}`); + this._closedRepositoriesManager.addRepository(openRepository.repository.root); + openRepository.dispose(); } @@ -666,10 +765,16 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu return liveRepository && liveRepository.repository; } - private getRepositoryExact(repoPath: string): Repository | undefined { - const openRepository = this.openRepositories - .find(r => pathEquals(r.repository.root, repoPath)); - return openRepository?.repository; + private async getRepositoryExact(repoPath: string): Promise { + const repoPathCanonical = await fs.promises.realpath(repoPath, { encoding: 'utf8' }); + + for (const openRepository of this.openRepositories) { + const rootPathCanonical = await fs.promises.realpath(openRepository.repository.root, { encoding: 'utf8' }); + if (pathEquals(rootPathCanonical, repoPathCanonical)) { + return openRepository.repository; + } + } + return undefined; } private getOpenRepository(repository: Repository): OpenRepository | undefined; @@ -818,6 +923,14 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu return [...this.pushErrorHandlers]; } + getUnsafeRepositoryPath(repository: string): string | undefined { + return this._unsafeRepositoriesManager.getRepositoryPath(repository); + } + + deleteUnsafeRepository(repository: string): boolean { + return this._unsafeRepositoriesManager.deleteRepository(repository); + } + private async isRepositoryOutsideWorkspace(repositoryPath: string): Promise { const workspaceFolders = (workspace.workspaceFolders || []) .filter(folder => folder.uri.scheme === 'file'); @@ -826,12 +939,14 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu return true; } - const result = await Promise.all(workspaceFolders.map(async folder => { - const workspaceFolderRealPath = await this.getWorkspaceFolderRealPath(folder); - return workspaceFolderRealPath ? pathEquals(workspaceFolderRealPath, repositoryPath) || isDescendant(workspaceFolderRealPath, repositoryPath) : undefined; - })); + // The repository path may be a canonical path or it may contain a symbolic link so we have + // to match it against the workspace folders and the canonical paths of the workspace folders + const workspaceFolderPaths = new Set([ + ...workspaceFolders.map(folder => folder.uri.fsPath), + ...await Promise.all(workspaceFolders.map(folder => this.getWorkspaceFolderRealPath(folder))) + ]); - return !result.some(r => r); + return !Array.from(workspaceFolderPaths).some(folder => folder && (pathEquals(folder, repositoryPath) || isDescendant(folder, repositoryPath))); } private async getWorkspaceFolderRealPath(workspaceFolder: WorkspaceFolder): Promise { @@ -851,7 +966,7 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu } private async showParentRepositoryNotification(): Promise { - const message = this.parentRepositories.size === 1 ? + const message = this.parentRepositories.length === 1 ? l10n.t('A git repository was found in the parent folders of the workspace or the open file(s). Would you like to open the repository?') : l10n.t('Git repositories were found in the parent folders of the workspace or the open file(s). Would you like to open the repositories?'); @@ -869,7 +984,7 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu await config.update('openRepositoryInParentFolders', choice === always ? 'always' : 'never', true); if (choice === always) { - for (const parentRepository of [...this.parentRepositories.keys()]) { + for (const parentRepository of this.parentRepositories) { await this.openParentRepository(parentRepository); } } @@ -884,7 +999,7 @@ export class Model implements IBranchProtectionProviderRegistry, IRemoteSourcePu return; } - const message = this._unsafeRepositories.size === 1 ? + const message = this.unsafeRepositories.length === 1 ? l10n.t('The git repository in the current folder is potentially unsafe as the folder is owned by someone other than the current user.') : l10n.t('The git repositories in the current folder are potentially unsafe as the folders are owned by someone other than the current user.'); diff --git a/extensions/git/src/postCommitCommands.ts b/extensions/git/src/postCommitCommands.ts index 1def1716a80..d4e227b6db7 100644 --- a/extensions/git/src/postCommitCommands.ts +++ b/extensions/git/src/postCommitCommands.ts @@ -117,7 +117,7 @@ export class CommitCommandsCenter { const commandFromStorage = allCommands.find(c => c.arguments?.length === 2 && c.arguments[1] === this.getPostCommitCommandStringFromStorage()); const commandFromSetting = allCommands.find(c => c.arguments?.length === 2 && c.arguments[1] === this.getPostCommitCommandStringFromSetting()); - return commandFromStorage ?? commandFromSetting ?? this.getCommitCommand(); + return commandFromStorage ?? commandFromSetting ?? this.getCommitCommands()[0]; } getSecondaryCommands(): Command[][] { @@ -131,7 +131,7 @@ export class CommitCommandsCenter { } if (commandGroups.length > 0) { - commandGroups[0].splice(0, 0, this.getCommitCommand()); + commandGroups.splice(0, 0, this.getCommitCommands()); } return commandGroups; @@ -169,7 +169,7 @@ export class CommitCommandsCenter { return `postCommitCommand:${this.repository.root}`; } - private getCommitCommand(): Command { + private getCommitCommands(): Command[] { const config = workspace.getConfiguration('git', Uri.file(this.repository.root)); // Branch protection @@ -196,7 +196,10 @@ export class CommitCommandsCenter { l10n.t('Committing Changes to New Branch...'); } - return { command: 'git.commit', title: l10n.t('{0} Commit', icon ?? '$(check)'), tooltip, arguments: [this.repository.sourceControl, null] }; + return [ + { command: 'git.commit', title: l10n.t('{0} Commit', icon ?? '$(check)'), tooltip, arguments: [this.repository.sourceControl, null] }, + { command: 'git.commitAmend', title: l10n.t('{0} Commit (Amend)', icon ?? '$(check)'), tooltip, arguments: [this.repository.sourceControl, null] }, + ]; } private getPostCommitCommandStringFromSetting(): string | undefined { diff --git a/extensions/git/src/remoteSource.ts b/extensions/git/src/remoteSource.ts index 4f62181f00c..4fdd6f06c1d 100644 --- a/extensions/git/src/remoteSource.ts +++ b/extensions/git/src/remoteSource.ts @@ -11,3 +11,7 @@ export async function pickRemoteSource(options: PickRemoteSourceOptions & { bran export async function pickRemoteSource(options: PickRemoteSourceOptions = {}): Promise { return GitBaseApi.getAPI().pickRemoteSource(options); } + +export async function getRemoteSourceActions(url: string) { + return GitBaseApi.getAPI().getRemoteSourceActions(url); +} diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index e7ed1cad955..77739e11ce9 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -58,6 +58,8 @@ export class Resource implements SourceControlResourceState { case Status.UNTRACKED: return l10n.t('Untracked'); case Status.IGNORED: return l10n.t('Ignored'); case Status.INTENT_TO_ADD: return l10n.t('Intent to Add'); + case Status.INTENT_TO_RENAME: return l10n.t('Intent to Rename'); + case Status.TYPE_CHANGED: return l10n.t('Type Changed'); case Status.BOTH_DELETED: return l10n.t('Conflict: Both Deleted'); case Status.ADDED_BY_US: return l10n.t('Conflict: Added By Us'); case Status.DELETED_BY_THEM: return l10n.t('Conflict: Deleted By Them'); @@ -71,7 +73,7 @@ export class Resource implements SourceControlResourceState { @memoize get resourceUri(): Uri { - if (this.renameResourceUri && (this._type === Status.MODIFIED || this._type === Status.DELETED || this._type === Status.INDEX_RENAMED || this._type === Status.INDEX_COPIED)) { + if (this.renameResourceUri && (this._type === Status.MODIFIED || this._type === Status.DELETED || this._type === Status.INDEX_RENAMED || this._type === Status.INDEX_COPIED || this._type === Status.INTENT_TO_RENAME)) { return this.renameResourceUri; } @@ -111,6 +113,7 @@ export class Resource implements SourceControlResourceState { Untracked: getIconUri('status-untracked', 'light'), Ignored: getIconUri('status-ignored', 'light'), Conflict: getIconUri('status-conflict', 'light'), + TypeChanged: getIconUri('status-type-changed', 'light') }, dark: { Modified: getIconUri('status-modified', 'dark'), @@ -120,7 +123,8 @@ export class Resource implements SourceControlResourceState { Copied: getIconUri('status-copied', 'dark'), Untracked: getIconUri('status-untracked', 'dark'), Ignored: getIconUri('status-ignored', 'dark'), - Conflict: getIconUri('status-conflict', 'dark') + Conflict: getIconUri('status-conflict', 'dark'), + TypeChanged: getIconUri('status-type-changed', 'dark') } }; @@ -136,6 +140,8 @@ export class Resource implements SourceControlResourceState { case Status.UNTRACKED: return Resource.Icons[theme].Untracked; case Status.IGNORED: return Resource.Icons[theme].Ignored; case Status.INTENT_TO_ADD: return Resource.Icons[theme].Added; + case Status.INTENT_TO_RENAME: return Resource.Icons[theme].Renamed; + case Status.TYPE_CHANGED: return Resource.Icons[theme].TypeChanged; case Status.BOTH_DELETED: return Resource.Icons[theme].Conflict; case Status.ADDED_BY_US: return Resource.Icons[theme].Conflict; case Status.DELETED_BY_THEM: return Resource.Icons[theme].Conflict; @@ -193,7 +199,10 @@ export class Resource implements SourceControlResourceState { case Status.DELETED: return 'D'; case Status.INDEX_RENAMED: + case Status.INTENT_TO_RENAME: return 'R'; + case Status.TYPE_CHANGED: + return 'T'; case Status.UNTRACKED: return 'U'; case Status.IGNORED: @@ -220,6 +229,7 @@ export class Resource implements SourceControlResourceState { case Status.INDEX_MODIFIED: return new ThemeColor('gitDecoration.stageModifiedResourceForeground'); case Status.MODIFIED: + case Status.TYPE_CHANGED: return new ThemeColor('gitDecoration.modifiedResourceForeground'); case Status.INDEX_DELETED: return new ThemeColor('gitDecoration.stageDeletedResourceForeground'); @@ -230,6 +240,7 @@ export class Resource implements SourceControlResourceState { return new ThemeColor('gitDecoration.addedResourceForeground'); case Status.INDEX_COPIED: case Status.INDEX_RENAMED: + case Status.INTENT_TO_RENAME: return new ThemeColor('gitDecoration.renamedResourceForeground'); case Status.UNTRACKED: return new ThemeColor('gitDecoration.untrackedResourceForeground'); @@ -253,6 +264,7 @@ export class Resource implements SourceControlResourceState { case Status.INDEX_MODIFIED: case Status.MODIFIED: case Status.INDEX_COPIED: + case Status.TYPE_CHANGED: return 2; case Status.IGNORED: return 3; @@ -520,6 +532,8 @@ class ResourceCommandResolver { case Status.INDEX_MODIFIED: case Status.INDEX_RENAMED: case Status.INDEX_ADDED: + case Status.INTENT_TO_RENAME: + case Status.TYPE_CHANGED: return toGitUri(resource.original, 'HEAD'); case Status.MODIFIED: @@ -554,7 +568,9 @@ class ResourceCommandResolver { case Status.MODIFIED: case Status.UNTRACKED: case Status.IGNORED: - case Status.INTENT_TO_ADD: { + case Status.INTENT_TO_ADD: + case Status.INTENT_TO_RENAME: + case Status.TYPE_CHANGED: { const uriString = resource.resourceUri.toString(); const [indexStatus] = this.repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString); @@ -599,6 +615,13 @@ class ResourceCommandResolver { case Status.UNTRACKED: return l10n.t('{0} (Untracked)', basename); + case Status.INTENT_TO_ADD: + case Status.INTENT_TO_RENAME: + return l10n.t('{0} (Intent to add)', basename); + + case Status.TYPE_CHANGED: + return l10n.t('{0} (Type changed)', basename); + default: return ''; } @@ -831,6 +854,7 @@ export class Repository implements Disposable { || e.affectsConfiguration('git.ignoreSubmodules', root) || e.affectsConfiguration('git.openDiffOnClick', root) || e.affectsConfiguration('git.showActionButton', root) + || e.affectsConfiguration('git.similarityThreshold', root) )(() => this.updateModelState(), this, this.disposables); const updateInputBoxVisibility = () => { @@ -1185,6 +1209,10 @@ export class Repository implements Disposable { } async commit(message: string | undefined, opts: CommitOptions = Object.create(null)): Promise { + const indexResources = [...this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath)]; + const workingGroupResources = opts.all && opts.all !== 'tracked' ? + [...this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath)] : []; + if (this.rebaseCommit) { await this.run( Operation.RebaseContinue, @@ -1195,7 +1223,7 @@ export class Repository implements Disposable { } await this.repository.rebaseContinue(); - await this.commitOperationCleanup(message, opts); + await this.commitOperationCleanup(message, indexResources, workingGroupResources); }, () => this.commitOperationGetOptimisticResourceGroups(opts)); } else { @@ -1218,7 +1246,7 @@ export class Repository implements Disposable { } await this.repository.commit(message, opts); - await this.commitOperationCleanup(message, opts); + await this.commitOperationCleanup(message, indexResources, workingGroupResources); }, () => this.commitOperationGetOptimisticResourceGroups(opts)); @@ -1229,15 +1257,10 @@ export class Repository implements Disposable { } } - private async commitOperationCleanup(message: string | undefined, opts: CommitOptions) { + private async commitOperationCleanup(message: string | undefined, indexResources: string[], workingGroupResources: string[]) { if (message) { this.inputBox.value = await this.getInputTemplate(); } - - const indexResources = [...this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath)]; - const workingGroupResources = opts.all && opts.all !== 'tracked' ? - [...this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath)] : []; - this.closeDiffEditors(indexResources, workingGroupResources); } @@ -2177,6 +2200,8 @@ export class Repository implements Disposable { case 'M': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.MODIFIED, useIcons, renameUri)); break; case 'D': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.DELETED, useIcons, renameUri)); break; case 'A': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.INTENT_TO_ADD, useIcons, renameUri)); break; + case 'R': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.INTENT_TO_RENAME, useIcons, renameUri)); break; + case 'T': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.TYPE_CHANGED, useIcons, renameUri)); break; } return undefined; @@ -2258,14 +2283,17 @@ export class Repository implements Disposable { const autorefresh = config.get('autorefresh'); if (!autorefresh) { + this.logger.trace('Skip running git status because autorefresh setting is disabled.'); return; } if (this.isRepositoryHuge) { + this.logger.trace('Skip running git status because repository is huge.'); return; } if (!this.operations.isIdle()) { + this.logger.trace('Skip running git status because an operation is running.'); return; } diff --git a/extensions/git/src/terminal.ts b/extensions/git/src/terminal.ts index 9501cc88bba..4f6d95488bb 100644 --- a/extensions/git/src/terminal.ts +++ b/extensions/git/src/terminal.ts @@ -3,10 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ExtensionContext, workspace } from 'vscode'; +import { ExtensionContext, l10n, workspace } from 'vscode'; import { filterEvent, IDisposable } from './util'; export interface ITerminalEnvironmentProvider { + featureDescription?: string; getTerminalEnv(): { [key: string]: string }; } @@ -29,12 +30,19 @@ export class TerminalEnvironmentManager { return; } + const features: string[] = []; for (const envProvider of this.envProviders) { const terminalEnv = envProvider?.getTerminalEnv() ?? {}; for (const name of Object.keys(terminalEnv)) { this.context.environmentVariableCollection.replace(name, terminalEnv[name]); } + if (envProvider?.featureDescription && Object.keys(terminalEnv).length > 0) { + features.push(envProvider.featureDescription); + } + } + if (features.length) { + this.context.environmentVariableCollection.description = l10n.t('Enables the following features: {0}', features.join(', ')); } } diff --git a/extensions/git/src/typings/vscode.proposed.canonicalUriIdentityProvider.d.ts b/extensions/git/src/typings/vscode.proposed.canonicalUriIdentityProvider.d.ts deleted file mode 100644 index 3a61ca15798..00000000000 --- a/extensions/git/src/typings/vscode.proposed.canonicalUriIdentityProvider.d.ts +++ /dev/null @@ -1,38 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -declare module 'vscode' { - - // https://github.com/microsoft/vscode/issues/180582 - - export namespace workspace { - /** - * - * @param scheme The URI scheme that this provider can provide canonical URI identities for. - * A canonical URI represents the conversion of a resource's alias into a source of truth URI. - * Multiple aliases may convert to the same source of truth URI. - * @param provider A provider which can convert URIs for workspace folders of scheme @param scheme to - * a canonical URI identifier which is stable across machines. - */ - export function registerCanonicalUriIdentityProvider(scheme: string, provider: CanonicalUriIdentityProvider): Disposable; - - /** - * - * @param uri The URI to provide a canonical URI identity for. - * @param token A cancellation token for the request. - */ - export function provideCanonicalUriIdentity(uri: Uri, token: CancellationToken): ProviderResult; - } - - export interface CanonicalUriIdentityProvider { - /** - * - * @param uri The URI to provide a canonical URI identity for. - * @param token A cancellation token for the request. - * @returns The canonical URI identity for the requested URI. - */ - provideCanonicalUriIdentity(uri: Uri, token: CancellationToken): ProviderResult; - } -} diff --git a/extensions/git/src/typings/vscode.proposed.canonicalUriProvider.d.ts b/extensions/git/src/typings/vscode.proposed.canonicalUriProvider.d.ts new file mode 100644 index 00000000000..84ee599797d --- /dev/null +++ b/extensions/git/src/typings/vscode.proposed.canonicalUriProvider.d.ts @@ -0,0 +1,47 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +declare module 'vscode' { + + // https://github.com/microsoft/vscode/issues/180582 + + export namespace workspace { + /** + * + * @param scheme The URI scheme that this provider can provide canonical URIs for. + * A canonical URI represents the conversion of a resource's alias into a source of truth URI. + * Multiple aliases may convert to the same source of truth URI. + * @param provider A provider which can convert URIs of scheme @param scheme to + * a canonical URI which is stable across machines. + */ + export function registerCanonicalUriProvider(scheme: string, provider: CanonicalUriProvider): Disposable; + + /** + * + * @param uri The URI to provide a canonical URI for. + * @param token A cancellation token for the request. + */ + export function getCanonicalUri(uri: Uri, options: CanonicalUriRequestOptions, token: CancellationToken): ProviderResult; + } + + export interface CanonicalUriProvider { + /** + * + * @param uri The URI to provide a canonical URI for. + * @param options Options that the provider should honor in the URI it returns. + * @param token A cancellation token for the request. + * @returns The canonical URI for the requested URI or undefined if no canonical URI can be provided. + */ + provideCanonicalUri(uri: Uri, options: CanonicalUriRequestOptions, token: CancellationToken): ProviderResult; + } + + export interface CanonicalUriRequestOptions { + /** + * + * The desired scheme of the canonical URI. + */ + targetScheme: string; + } +} diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock index fac7f29a878..1a928aec322 100644 --- a/extensions/git/yarn.lock +++ b/extensions/git/yarn.lock @@ -202,10 +202,10 @@ resolved "https://registry.yarnpkg.com/@types/picomatch/-/picomatch-2.3.0.tgz#75db5e75a713c5a83d5b76780c3da84a82806003" integrity sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g== -"@types/which@^1.0.28": - version "1.0.28" - resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6" - integrity sha1-AW44dim4gXvtZT/jLqtdESecjfY= +"@types/which@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/which/-/which-3.0.0.tgz#849afdd9fdcb0b67339b9cfc80fa6ea4e0253fc5" + integrity sha512-ASCxdbsrwNfSMXALlC3Decif9rwDMu+80KGp5zI2RLRotfMsTv7fHL8W8VDp24wymzDyIFudhUeSCugrgRFfHQ== "@vscode/extension-telemetry@0.7.5": version "0.7.5" @@ -430,9 +430,9 @@ safe-buffer@~5.2.0: integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== semver@^5.3.0, semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== shimmer@^1.1.0, shimmer@^1.2.0: version "1.2.1" @@ -487,9 +487,9 @@ vscode-uri@^2.0.0: resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.0.tgz#2df704222f72b8a71ff266ba0830ed6c51ac1542" integrity sha512-lWXWofDSYD8r/TIyu64MdwB4FaSirQ608PP/TzUyslyOeHGwQ0eTHUZeJrK1ILOmwUHaJtV693m2JoUYroUDpw== -which@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" - integrity sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg== +which@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/which/-/which-3.0.1.tgz#89f1cd0c23f629a8105ffe69b8172791c87b4be1" + integrity sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg== dependencies: isexe "^2.0.0" diff --git a/extensions/github-authentication/extension-browser.webpack.config.js b/extensions/github-authentication/extension-browser.webpack.config.js index 37b207eb056..f109e203569 100644 --- a/extensions/github-authentication/extension-browser.webpack.config.js +++ b/extensions/github-authentication/extension-browser.webpack.config.js @@ -21,7 +21,8 @@ module.exports = withBrowserDefaults({ 'uuid': path.resolve(__dirname, 'node_modules/uuid/dist/esm-browser/index.js'), './node/authServer': path.resolve(__dirname, 'src/browser/authServer'), './node/crypto': path.resolve(__dirname, 'src/browser/crypto'), - './node/fetch': path.resolve(__dirname, 'src/browser/fetch') + './node/fetch': path.resolve(__dirname, 'src/browser/fetch'), + './node/buffer': path.resolve(__dirname, 'src/browser/buffer'), } } }); diff --git a/src/typings/windows-registry.d.ts b/extensions/github-authentication/src/browser/buffer.ts similarity index 57% rename from src/typings/windows-registry.d.ts rename to extensions/github-authentication/src/browser/buffer.ts index 165a20613ab..7192f5f104a 100644 --- a/src/typings/windows-registry.d.ts +++ b/extensions/github-authentication/src/browser/buffer.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -declare module '@vscode/windows-registry' { - export type HKEY = 'HKEY_CURRENT_USER' | 'HKEY_LOCAL_MACHINE' | 'HKEY_CLASSES_ROOT' | 'HKEY_USERS' | 'HKEY_CURRENT_CONFIG'; - export function GetStringRegKey(hive: HKEY, path: string, name: string): string | undefined; +export function base64Encode(text: string): string { + return btoa(text); } diff --git a/extensions/github-authentication/src/common/env.ts b/extensions/github-authentication/src/common/env.ts index 7b99a148373..ebc474936aa 100644 --- a/extensions/github-authentication/src/common/env.ts +++ b/extensions/github-authentication/src/common/env.ts @@ -29,6 +29,10 @@ export function isSupportedClient(uri: Uri): boolean { export function isSupportedTarget(type: AuthProviderType, gheUri?: Uri): boolean { return ( type === AuthProviderType.github || - /\.ghe\.com$/.test(gheUri!.authority) + isHostedGitHubEnterprise(gheUri!) ); } + +export function isHostedGitHubEnterprise(uri: Uri): boolean { + return /\.ghe\.com$/.test(uri.authority); +} diff --git a/extensions/github-authentication/src/common/errors.ts b/extensions/github-authentication/src/common/errors.ts new file mode 100644 index 00000000000..3ba3dfc006a --- /dev/null +++ b/extensions/github-authentication/src/common/errors.ts @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +export const TIMED_OUT_ERROR = 'Timed out'; + +// These error messages are internal and should not be shown to the user in any way. +export const USER_CANCELLATION_ERROR = 'User Cancelled'; +export const NETWORK_ERROR = 'network error'; diff --git a/extensions/github-authentication/src/common/logger.ts b/extensions/github-authentication/src/common/logger.ts index 84225bd707f..cf90c4176a9 100644 --- a/extensions/github-authentication/src/common/logger.ts +++ b/extensions/github-authentication/src/common/logger.ts @@ -26,4 +26,7 @@ export class Log { this.output.error(message); } + public warn(message: string): void { + this.output.warn(message); + } } diff --git a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.css b/extensions/github-authentication/src/config.ts similarity index 53% rename from src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.css rename to extensions/github-authentication/src/config.ts index 56be1c3b003..30b9dd66265 100644 --- a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.css +++ b/extensions/github-authentication/src/config.ts @@ -3,12 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -.monaco-editor .accessibilityHelpWidget { - padding: 10px; - vertical-align: middle; - overflow: scroll; - color: var(--vscode-editorWidget-foreground); - background-color: var(--vscode-editorWidget-background); - box-shadow: 0 2px 8px var(--vscode-widget-shadow); - border: 2px solid var(--vscode-contrastBorder); +export interface IConfig { + // The client ID of the GitHub OAuth app + gitHubClientId: string; + gitHubClientSecret?: string; } + +// For easy access to mixin client ID and secret +export const Config: IConfig = { + gitHubClientId: '01ab8ac9400c4e429b23' +}; diff --git a/extensions/github-authentication/src/flows.ts b/extensions/github-authentication/src/flows.ts new file mode 100644 index 00000000000..5bc9d095385 --- /dev/null +++ b/extensions/github-authentication/src/flows.ts @@ -0,0 +1,500 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as path from 'path'; +import { ProgressLocation, Uri, commands, env, l10n, window } from 'vscode'; +import { Log } from './common/logger'; +import { Config } from './config'; +import { UriEventHandler } from './github'; +import { fetching } from './node/fetch'; +import { LoopbackAuthServer } from './node/authServer'; +import { promiseFromEvent } from './common/utils'; +import { isHostedGitHubEnterprise } from './common/env'; +import { NETWORK_ERROR, TIMED_OUT_ERROR, USER_CANCELLATION_ERROR } from './common/errors'; + +interface IGitHubDeviceCodeResponse { + device_code: string; + user_code: string; + verification_uri: string; + interval: number; +} + +interface IFlowOptions { + // GitHub.com + readonly supportsGitHubDotCom: boolean; + // A GitHub Enterprise Server that is hosted by an organization + readonly supportsGitHubEnterpriseServer: boolean; + // A GitHub Enterprise Server that is hosted by GitHub for an organization + readonly supportsHostedGitHubEnterprise: boolean; + + // Runtimes - there are constraints on which runtimes support which flows + readonly supportsWebWorkerExtensionHost: boolean; + readonly supportsRemoteExtensionHost: boolean; + + // Clients - see `isSupportedClient` in `common/env.ts` for what constitutes a supported client + readonly supportsSupportedClients: boolean; + readonly supportsUnsupportedClients: boolean; + + // Configurations - some flows require a client secret + readonly supportsNoClientSecret: boolean; +} + +export const enum GitHubTarget { + DotCom, + Enterprise, + HostedEnterprise +} + +export const enum ExtensionHost { + WebWorker, + Remote, + Local +} + +interface IFlowQuery { + target: GitHubTarget; + extensionHost: ExtensionHost; + isSupportedClient: boolean; +} + +interface IFlowTriggerOptions { + scopes: string; + baseUri: Uri; + logger: Log; + redirectUri: Uri; + nonce: string; + callbackUri: Uri; + uriHandler: UriEventHandler; + enterpriseUri?: Uri; +} + +interface IFlow { + label: string; + options: IFlowOptions; + trigger(options: IFlowTriggerOptions): Promise; +} + +async function exchangeCodeForToken( + logger: Log, + endpointUri: Uri, + redirectUri: Uri, + code: string, + enterpriseUri?: Uri +): Promise { + logger.info('Exchanging code for token...'); + + const clientSecret = Config.gitHubClientSecret; + if (!clientSecret) { + throw new Error('No client secret configured for GitHub authentication.'); + } + + const body = new URLSearchParams([ + ['code', code], + ['client_id', Config.gitHubClientId], + ['redirect_uri', redirectUri.toString(true)], + ['client_secret', clientSecret] + ]); + if (enterpriseUri) { + body.append('github_enterprise', enterpriseUri.toString(true)); + } + const result = await fetching(endpointUri.toString(true), { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/x-www-form-urlencoded', + 'Content-Length': body.toString() + + }, + body: body.toString() + }); + + if (result.ok) { + const json = await result.json(); + logger.info('Token exchange success!'); + return json.access_token; + } else { + const text = await result.text(); + const error = new Error(text); + error.name = 'GitHubTokenExchangeError'; + throw error; + } +} + +const allFlows: IFlow[] = [ + new class UrlHandlerFlow implements IFlow { + label = l10n.t('url handler'); + options: IFlowOptions = { + supportsGitHubDotCom: true, + // Supporting GHES would be challenging because different versions + // used a different client ID. We could try to detect the version + // and use the right one, but that's a lot of work when we have + // other flows that work well. + supportsGitHubEnterpriseServer: false, + supportsHostedGitHubEnterprise: true, + supportsRemoteExtensionHost: true, + supportsWebWorkerExtensionHost: true, + // exchanging a code for a token requires a client secret + supportsNoClientSecret: false, + supportsSupportedClients: true, + supportsUnsupportedClients: false + }; + + async trigger({ + scopes, + baseUri, + redirectUri, + logger, + nonce, + callbackUri, + uriHandler, + enterpriseUri + }: IFlowTriggerOptions): Promise { + logger.info(`Trying without local server... (${scopes})`); + return await window.withProgress({ + location: ProgressLocation.Notification, + title: l10n.t({ + message: 'Signing in to {0}...', + args: [baseUri.authority], + comment: ['The {0} will be a url, e.g. github.com'] + }), + cancellable: true + }, async (_, token) => { + const promise = uriHandler.waitForCode(logger, scopes, nonce, token); + + const searchParams = new URLSearchParams([ + ['client_id', Config.gitHubClientId], + ['redirect_uri', redirectUri.toString(true)], + ['scope', scopes], + ['state', encodeURIComponent(callbackUri.toString(true))] + ]); + + // The extra toString, parse is apparently needed for env.openExternal + // to open the correct URL. + const uri = Uri.parse(baseUri.with({ + path: '/login/oauth/authorize', + query: searchParams.toString() + }).toString(true)); + await env.openExternal(uri); + + const code = await promise; + + const proxyEndpoints: { [providerId: string]: string } | undefined = await commands.executeCommand('workbench.getCodeExchangeProxyEndpoints'); + const endpointUrl = proxyEndpoints?.github + ? Uri.parse(`${proxyEndpoints.github}login/oauth/access_token`) + : baseUri.with({ path: '/login/oauth/access_token' }); + + const accessToken = await exchangeCodeForToken(logger, endpointUrl, redirectUri, code, enterpriseUri); + return accessToken; + }); + } + }, + new class LocalServerFlow implements IFlow { + label = l10n.t('local server'); + options: IFlowOptions = { + supportsGitHubDotCom: true, + // Supporting GHES would be challenging because different versions + // used a different client ID. We could try to detect the version + // and use the right one, but that's a lot of work when we have + // other flows that work well. + supportsGitHubEnterpriseServer: false, + supportsHostedGitHubEnterprise: true, + supportsRemoteExtensionHost: true, + // Web worker can't open a port to listen for the redirect + supportsWebWorkerExtensionHost: false, + // exchanging a code for a token requires a client secret + supportsNoClientSecret: false, + supportsSupportedClients: true, + supportsUnsupportedClients: true + }; + async trigger({ + scopes, + baseUri, + redirectUri, + logger, + enterpriseUri + }: IFlowTriggerOptions): Promise { + logger.info(`Trying with local server... (${scopes})`); + return await window.withProgress({ + location: ProgressLocation.Notification, + title: l10n.t({ + message: 'Signing in to {0}...', + args: [baseUri.authority], + comment: ['The {0} will be a url, e.g. github.com'] + }), + cancellable: true + }, async (_, token) => { + const searchParams = new URLSearchParams([ + ['client_id', Config.gitHubClientId], + ['redirect_uri', redirectUri.toString(true)], + ['scope', scopes], + ]); + + const loginUrl = baseUri.with({ + path: '/login/oauth/authorize', + query: searchParams.toString() + }); + const server = new LoopbackAuthServer(path.join(__dirname, '../media'), loginUrl.toString(true)); + const port = await server.start(); + + let codeToExchange; + try { + env.openExternal(Uri.parse(`http://127.0.0.1:${port}/signin?nonce=${encodeURIComponent(server.nonce)}`)); + const { code } = await Promise.race([ + server.waitForOAuthResponse(), + new Promise((_, reject) => setTimeout(() => reject(TIMED_OUT_ERROR), 300_000)), // 5min timeout + promiseFromEvent(token.onCancellationRequested, (_, __, reject) => { reject(USER_CANCELLATION_ERROR); }).promise + ]); + codeToExchange = code; + } finally { + setTimeout(() => { + void server.stop(); + }, 5000); + } + + const accessToken = await exchangeCodeForToken( + logger, + baseUri.with({ path: '/login/oauth/access_token' }), + redirectUri, + codeToExchange, + enterpriseUri); + return accessToken; + }); + } + }, + new class DeviceCodeFlow implements IFlow { + label = l10n.t('device code'); + options: IFlowOptions = { + supportsGitHubDotCom: true, + supportsGitHubEnterpriseServer: true, + supportsHostedGitHubEnterprise: true, + supportsRemoteExtensionHost: true, + // CORS prevents this from working in web workers + supportsWebWorkerExtensionHost: false, + supportsNoClientSecret: true, + supportsSupportedClients: true, + supportsUnsupportedClients: true + }; + async trigger({ scopes, baseUri, logger }: IFlowTriggerOptions) { + logger.info(`Trying device code flow... (${scopes})`); + + // Get initial device code + const uri = baseUri.with({ + path: '/login/device/code', + query: `client_id=${Config.gitHubClientId}&scope=${scopes}` + }); + const result = await fetching(uri.toString(true), { + method: 'POST', + headers: { + Accept: 'application/json' + } + }); + if (!result.ok) { + throw new Error(`Failed to get one-time code: ${await result.text()}`); + } + + const json = await result.json() as IGitHubDeviceCodeResponse; + + const button = l10n.t('Copy & Continue to GitHub'); + const modalResult = await window.showInformationMessage( + l10n.t({ message: 'Your Code: {0}', args: [json.user_code], comment: ['The {0} will be a code, e.g. 123-456'] }), + { + modal: true, + detail: l10n.t('To finish authenticating, navigate to GitHub and paste in the above one-time code.') + }, button); + + if (modalResult !== button) { + throw new Error(USER_CANCELLATION_ERROR); + } + + await env.clipboard.writeText(json.user_code); + + const uriToOpen = await env.asExternalUri(Uri.parse(json.verification_uri)); + await env.openExternal(uriToOpen); + + return await this.waitForDeviceCodeAccessToken(baseUri, json); + } + + private async waitForDeviceCodeAccessToken( + baseUri: Uri, + json: IGitHubDeviceCodeResponse, + ): Promise { + return await window.withProgress({ + location: ProgressLocation.Notification, + cancellable: true, + title: l10n.t({ + message: 'Open [{0}]({0}) in a new tab and paste your one-time code: {1}', + args: [json.verification_uri, json.user_code], + comment: [ + 'The [{0}]({0}) will be a url and the {1} will be a code, e.g. 123-456', + '{Locked="[{0}]({0})"}' + ] + }) + }, async (_, token) => { + const refreshTokenUri = baseUri.with({ + path: '/login/oauth/access_token', + query: `client_id=${Config.gitHubClientId}&device_code=${json.device_code}&grant_type=urn:ietf:params:oauth:grant-type:device_code` + }); + + // Try for 2 minutes + const attempts = 120 / json.interval; + for (let i = 0; i < attempts; i++) { + await new Promise(resolve => setTimeout(resolve, json.interval * 1000)); + if (token.isCancellationRequested) { + throw new Error(USER_CANCELLATION_ERROR); + } + let accessTokenResult; + try { + accessTokenResult = await fetching(refreshTokenUri.toString(true), { + method: 'POST', + headers: { + Accept: 'application/json' + } + }); + } catch { + continue; + } + + if (!accessTokenResult.ok) { + continue; + } + + const accessTokenJson = await accessTokenResult.json(); + + if (accessTokenJson.error === 'authorization_pending') { + continue; + } + + if (accessTokenJson.error) { + throw new Error(accessTokenJson.error_description); + } + + return accessTokenJson.access_token; + } + + throw new Error(TIMED_OUT_ERROR); + }); + } + }, + new class PatFlow implements IFlow { + label = l10n.t('personal access token'); + options: IFlowOptions = { + supportsGitHubDotCom: true, + supportsGitHubEnterpriseServer: true, + supportsHostedGitHubEnterprise: true, + supportsRemoteExtensionHost: true, + supportsWebWorkerExtensionHost: true, + supportsNoClientSecret: true, + // PATs can't be used with Settings Sync so we don't enable this flow + // for supported clients + supportsSupportedClients: false, + supportsUnsupportedClients: true + }; + + async trigger({ scopes, baseUri, logger, enterpriseUri }: IFlowTriggerOptions) { + logger.info(`Trying to retrieve PAT... (${scopes})`); + + const button = l10n.t('Continue to GitHub'); + const modalResult = await window.showInformationMessage( + l10n.t('Continue to GitHub to create a Personal Access Token (PAT)'), + { + modal: true, + detail: l10n.t('To finish authenticating, navigate to GitHub to create a PAT then paste the PAT into the input box.') + }, button); + + if (modalResult !== button) { + throw new Error(USER_CANCELLATION_ERROR); + } + + const description = `${env.appName} (${scopes})`; + const uriToOpen = await env.asExternalUri(baseUri.with({ path: '/settings/tokens/new', query: `description=${description}&scopes=${scopes.split(' ').join(',')}` })); + await env.openExternal(uriToOpen); + const token = await window.showInputBox({ placeHolder: `ghp_1a2b3c4...`, prompt: `GitHub Personal Access Token - ${scopes}`, ignoreFocusOut: true }); + if (!token) { throw new Error(USER_CANCELLATION_ERROR); } + + const appUri = !enterpriseUri || isHostedGitHubEnterprise(enterpriseUri) + ? Uri.parse(`${baseUri.scheme}://api.${baseUri.authority}`) + : Uri.parse(`${baseUri.scheme}://${baseUri.authority}/api/v3`); + + const tokenScopes = await this.getScopes(token, appUri, logger); // Example: ['repo', 'user'] + const scopesList = scopes.split(' '); // Example: 'read:user repo user:email' + if (!scopesList.every(scope => { + const included = tokenScopes.includes(scope); + if (included || !scope.includes(':')) { + return included; + } + + return scope.split(':').some(splitScopes => { + return tokenScopes.includes(splitScopes); + }); + })) { + throw new Error(`The provided token does not match the requested scopes: ${scopes}`); + } + + return token; + } + + private async getScopes(token: string, serverUri: Uri, logger: Log): Promise { + try { + logger.info('Getting token scopes...'); + const result = await fetching(serverUri.toString(), { + headers: { + Authorization: `token ${token}`, + 'User-Agent': `${env.appName} (${env.appHost})` + } + }); + + if (result.ok) { + const scopes = result.headers.get('X-OAuth-Scopes'); + return scopes ? scopes.split(',').map(scope => scope.trim()) : []; + } else { + logger.error(`Getting scopes failed: ${result.statusText}`); + throw new Error(result.statusText); + } + } catch (ex) { + logger.error(ex.message); + throw new Error(NETWORK_ERROR); + } + } + } +]; + +export function getFlows(query: IFlowQuery) { + return allFlows.filter(flow => { + let useFlow: boolean = true; + switch (query.target) { + case GitHubTarget.DotCom: + useFlow &&= flow.options.supportsGitHubDotCom; + break; + case GitHubTarget.Enterprise: + useFlow &&= flow.options.supportsGitHubEnterpriseServer; + break; + case GitHubTarget.HostedEnterprise: + useFlow &&= flow.options.supportsHostedGitHubEnterprise; + break; + } + + switch (query.extensionHost) { + case ExtensionHost.Remote: + useFlow &&= flow.options.supportsRemoteExtensionHost; + break; + case ExtensionHost.WebWorker: + useFlow &&= flow.options.supportsWebWorkerExtensionHost; + break; + } + + if (!Config.gitHubClientSecret) { + useFlow &&= flow.options.supportsNoClientSecret; + } + + if (query.isSupportedClient) { + // TODO: revisit how we support PAT in GHES but not DotCom... but this works for now since + // there isn't another flow that has supportsSupportedClients = false + useFlow &&= (flow.options.supportsSupportedClients || query.target !== GitHubTarget.DotCom); + } else { + useFlow &&= flow.options.supportsUnsupportedClients; + } + return useFlow; + }); +} diff --git a/extensions/github-authentication/src/github.ts b/extensions/github-authentication/src/github.ts index 0588065eacd..71aa17bd5cc 100644 --- a/extensions/github-authentication/src/github.ts +++ b/extensions/github-authentication/src/github.ts @@ -7,10 +7,11 @@ import * as vscode from 'vscode'; import TelemetryReporter from '@vscode/extension-telemetry'; import { Keychain } from './common/keychain'; import { GitHubServer, IGitHubServer } from './githubServer'; -import { arrayEquals } from './common/utils'; +import { PromiseAdapter, arrayEquals, promiseFromEvent } from './common/utils'; import { ExperimentationTelemetry } from './common/experimentationService'; import { Log } from './common/logger'; import { crypto } from './node/crypto'; +import { TIMED_OUT_ERROR, USER_CANCELLATION_ERROR } from './common/errors'; interface SessionData { id: string; @@ -29,9 +30,63 @@ export enum AuthProviderType { } export class UriEventHandler extends vscode.EventEmitter implements vscode.UriHandler { + private readonly _pendingNonces = new Map(); + private readonly _codeExchangePromises = new Map; cancel: vscode.EventEmitter }>(); + public handleUri(uri: vscode.Uri) { this.fire(uri); } + + public async waitForCode(logger: Log, scopes: string, nonce: string, token: vscode.CancellationToken) { + const existingNonces = this._pendingNonces.get(scopes) || []; + this._pendingNonces.set(scopes, [...existingNonces, nonce]); + + let codeExchangePromise = this._codeExchangePromises.get(scopes); + if (!codeExchangePromise) { + codeExchangePromise = promiseFromEvent(this.event, this.handleEvent(logger, scopes)); + this._codeExchangePromises.set(scopes, codeExchangePromise); + } + + try { + return await Promise.race([ + codeExchangePromise.promise, + new Promise((_, reject) => setTimeout(() => reject(TIMED_OUT_ERROR), 300_000)), // 5min timeout + promiseFromEvent(token.onCancellationRequested, (_, __, reject) => { reject(USER_CANCELLATION_ERROR); }).promise + ]); + } finally { + this._pendingNonces.delete(scopes); + codeExchangePromise?.cancel.fire(); + this._codeExchangePromises.delete(scopes); + } + } + + private handleEvent: (logger: Log, scopes: string) => PromiseAdapter = + (logger: Log, scopes) => (uri, resolve, reject) => { + const query = new URLSearchParams(uri.query); + const code = query.get('code'); + const nonce = query.get('nonce'); + if (!code) { + reject(new Error('No code')); + return; + } + if (!nonce) { + reject(new Error('No nonce')); + return; + } + + const acceptedNonces = this._pendingNonces.get(scopes) || []; + if (!acceptedNonces.includes(nonce)) { + // A common scenario of this happening is if you: + // 1. Trigger a sign in with one set of scopes + // 2. Before finishing 1, you trigger a sign in with a different set of scopes + // In this scenario we should just return and wait for the next UriHandler event + // to run as we are probably still waiting on the user to hit 'Continue' + logger.info('Nonce not found in accepted nonces. Skipping this execution...'); + return; + } + + resolve(code); + }; } export class GitHubAuthenticationProvider implements vscode.AuthenticationProvider, vscode.Disposable { @@ -308,6 +363,7 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid sessions.splice(sessionIndex, 1); await this.storeSessions(sessions); + await this._githubServer.logout(session); this._sessionChangeEmitter.fire({ added: [], removed: [session], changed: [] }); } else { diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts index 98bb1dd822f..0729c4c5077 100644 --- a/extensions/github-authentication/src/githubServer.ts +++ b/extensions/github-authentication/src/githubServer.ts @@ -4,72 +4,36 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import * as path from 'path'; -import { PromiseAdapter, promiseFromEvent } from './common/utils'; import { ExperimentationTelemetry } from './common/experimentationService'; import { AuthProviderType, UriEventHandler } from './github'; import { Log } from './common/logger'; import { isSupportedClient, isSupportedTarget } from './common/env'; -import { LoopbackAuthServer } from './node/authServer'; import { crypto } from './node/crypto'; import { fetching } from './node/fetch'; - -const CLIENT_ID = '01ab8ac9400c4e429b23'; -const GITHUB_TOKEN_URL = 'https://vscode.dev/codeExchangeProxyEndpoints/github/login/oauth/access_token'; +import { ExtensionHost, GitHubTarget, getFlows } from './flows'; +import { NETWORK_ERROR, USER_CANCELLATION_ERROR } from './common/errors'; +import { Config } from './config'; +import { base64Encode } from './node/buffer'; // This is the error message that we throw if the login was cancelled for any reason. Extensions // calling `getSession` can handle this error to know that the user cancelled the login. const CANCELLATION_ERROR = 'Cancelled'; -// These error messages are internal and should not be shown to the user in any way. -const TIMED_OUT_ERROR = 'Timed out'; -const USER_CANCELLATION_ERROR = 'User Cancelled'; -const NETWORK_ERROR = 'network error'; const REDIRECT_URL_STABLE = 'https://vscode.dev/redirect'; const REDIRECT_URL_INSIDERS = 'https://insiders.vscode.dev/redirect'; export interface IGitHubServer { login(scopes: string): Promise; + logout(session: vscode.AuthenticationSession): Promise; getUserInfo(token: string): Promise<{ id: string; accountName: string }>; sendAdditionalTelemetryInfo(session: vscode.AuthenticationSession): Promise; friendlyName: string; } -interface IGitHubDeviceCodeResponse { - device_code: string; - user_code: string; - verification_uri: string; - interval: number; -} - -async function getScopes(token: string, serverUri: vscode.Uri, logger: Log): Promise { - try { - logger.info('Getting token scopes...'); - const result = await fetching(serverUri.toString(), { - headers: { - Authorization: `token ${token}`, - 'User-Agent': `${vscode.env.appName} (${vscode.env.appHost})` - } - }); - - if (result.ok) { - const scopes = result.headers.get('X-OAuth-Scopes'); - return scopes ? scopes.split(',').map(scope => scope.trim()) : []; - } else { - logger.error(`Getting scopes failed: ${result.statusText}`); - throw new Error(result.statusText); - } - } catch (ex) { - logger.error(ex.message); - throw new Error(NETWORK_ERROR); - } -} export class GitHubServer implements IGitHubServer { readonly friendlyName: string; - private readonly _pendingNonces = new Map(); - private readonly _codeExchangePromises = new Map; cancel: vscode.EventEmitter }>(); private readonly _type: AuthProviderType; private _redirectEndpoint: string | undefined; @@ -117,9 +81,14 @@ export class GitHubServer implements IGitHubServer { } // TODO@joaomoreno TODO@TylerLeonhardt + private _isNoCorsEnvironment: boolean | undefined; private async isNoCorsEnvironment(): Promise { + if (this._isNoCorsEnvironment !== undefined) { + return this._isNoCorsEnvironment; + } const uri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/dummy`)); - return (uri.scheme === 'https' && /^((insiders\.)?vscode|github)\./.test(uri.authority)) || (uri.scheme === 'http' && /^localhost/.test(uri.authority)); + this._isNoCorsEnvironment = (uri.scheme === 'https' && /^((insiders\.)?vscode|github)\./.test(uri.authority)) || (uri.scheme === 'http' && /^localhost/.test(uri.authority)); + return this._isNoCorsEnvironment; } public async login(scopes: string): Promise { @@ -148,48 +117,33 @@ export class GitHubServer implements IGitHubServer { const supportedClient = isSupportedClient(callbackUri); const supportedTarget = isSupportedTarget(this._type, this._ghesUri); - if (supportedClient && supportedTarget) { - try { - return await this.doLoginWithoutLocalServer(scopes, nonce, callbackUri); - } catch (e) { - this._logger.error(e); - userCancelled = e.message ?? e === USER_CANCELLATION_ERROR; - } - } - // Starting a local server is only supported if: - // 1. We are in a UI extension because we need to open a port on the machine that has the browser - // 2. We are in a node runtime because we need to open a port on the machine - // 3. code exchange can only be done with a supported target - if ( - this._extensionKind === vscode.ExtensionKind.UI && - typeof navigator === 'undefined' && - supportedTarget - ) { - try { - await promptToContinue(vscode.l10n.t('local server')); - return await this.doLoginWithLocalServer(scopes); - } catch (e) { - userCancelled = this.processLoginError(e); - } - } + const flows = getFlows({ + target: this._type === AuthProviderType.github + ? GitHubTarget.DotCom + : supportedTarget ? GitHubTarget.HostedEnterprise : GitHubTarget.Enterprise, + extensionHost: typeof navigator === 'undefined' + ? this._extensionKind === vscode.ExtensionKind.UI ? ExtensionHost.Local : ExtensionHost.Remote + : ExtensionHost.WebWorker, + isSupportedClient: supportedClient + }); - // We only can use the Device Code flow when we have a full node environment because of CORS. - if (typeof navigator === 'undefined') { - try { - await promptToContinue(vscode.l10n.t('device code')); - return await this.doLoginDeviceCodeFlow(scopes); - } catch (e) { - userCancelled = this.processLoginError(e); - } - } - // In a supported environment, we can't use PAT auth because we use this auth for Settings Sync and it doesn't support PATs. - // With that said, GitHub Enterprise isn't used by Settings Sync so we can use PATs for that. - if (!supportedClient || this._type === AuthProviderType.githubEnterprise) { + for (const flow of flows) { try { - await promptToContinue(vscode.l10n.t('personal access token')); - return await this.doLoginWithPat(scopes); + if (flow !== flows[0]) { + await promptToContinue(flow.label); + } + return await flow.trigger({ + scopes, + callbackUri, + nonce, + baseUri: this.baseUri, + logger: this._logger, + uriHandler: this._uriHandler, + enterpriseUri: this._ghesUri, + redirectUri: vscode.Uri.parse(await this.getRedirectEndpoint()), + }); } catch (e) { userCancelled = this.processLoginError(e); } @@ -198,298 +152,55 @@ export class GitHubServer implements IGitHubServer { throw new Error(userCancelled ? CANCELLATION_ERROR : 'No auth flow succeeded.'); } - private async doLoginWithoutLocalServer(scopes: string, nonce: string, callbackUri: vscode.Uri): Promise { - this._logger.info(`Trying without local server... (${scopes})`); - return await vscode.window.withProgress({ - location: vscode.ProgressLocation.Notification, - title: vscode.l10n.t({ - message: 'Signing in to {0}...', - args: [this.baseUri.authority], - comment: ['The {0} will be a url, e.g. github.com'] - }), - cancellable: true - }, async (_, token) => { - const existingNonces = this._pendingNonces.get(scopes) || []; - this._pendingNonces.set(scopes, [...existingNonces, nonce]); - const redirectUri = await this.getRedirectEndpoint(); - const searchParams = new URLSearchParams([ - ['client_id', CLIENT_ID], - ['redirect_uri', redirectUri], - ['scope', scopes], - ['state', encodeURIComponent(callbackUri.toString(true))] - ]); + public async logout(session: vscode.AuthenticationSession): Promise { + this._logger.trace(`Deleting session (${session.id}) from server...`); - const uri = vscode.Uri.parse(this.baseUri.with({ - path: '/login/oauth/authorize', - query: searchParams.toString() - }).toString(true)); - await vscode.env.openExternal(uri); + if (!Config.gitHubClientSecret) { + this._logger.warn('No client secret configured for GitHub authentication. The token has been deleted with best effort on this system, but we are unable to delete the token on server without the client secret.'); + return; + } - // Register a single listener for the URI callback, in case the user starts the login process multiple times - // before completing it. - let codeExchangePromise = this._codeExchangePromises.get(scopes); - if (!codeExchangePromise) { - codeExchangePromise = promiseFromEvent(this._uriHandler!.event, this.handleUri(scopes)); - this._codeExchangePromises.set(scopes, codeExchangePromise); + // Only attempt to delete OAuth tokens. They are always prefixed with `gho_`. + // https://docs.github.com/en/rest/apps/oauth-applications#about-oauth-apps-and-oauth-authorizations-of-github-apps + if (!session.accessToken.startsWith('gho_')) { + this._logger.warn('The token being deleted is not an OAuth token. It has been deleted locally, but we cannot delete it on server.'); + return; + } + + if (!isSupportedTarget(this._type, this._ghesUri)) { + this._logger.trace('GitHub.com and GitHub hosted GitHub Enterprise are the only options that support deleting tokens on the server. Skipping.'); + return; + } + + const authHeader = 'Basic ' + base64Encode(`${Config.gitHubClientId}:${Config.gitHubClientSecret}`); + const uri = this.getServerUri(`/applications/${Config.gitHubClientId}/token`); + + try { + // Defined here: https://docs.github.com/en/rest/apps/oauth-applications?apiVersion=2022-11-28#delete-an-app-token + const result = await fetching(uri.toString(true), { + method: 'DELETE', + headers: { + Accept: 'application/vnd.github+json', + Authorization: authHeader, + 'X-GitHub-Api-Version': '2022-11-28', + 'User-Agent': `${vscode.env.appName} (${vscode.env.appHost})` + }, + body: JSON.stringify({ access_token: session.accessToken }), + }); + + if (result.status === 204) { + this._logger.trace(`Successfully deleted token from session (${session.id}) from server.`); + return; } try { - return await Promise.race([ - codeExchangePromise.promise, - new Promise((_, reject) => setTimeout(() => reject(TIMED_OUT_ERROR), 300_000)), // 5min timeout - promiseFromEvent(token.onCancellationRequested, (_, __, reject) => { reject(USER_CANCELLATION_ERROR); }).promise - ]); - } finally { - this._pendingNonces.delete(scopes); - codeExchangePromise?.cancel.fire(); - this._codeExchangePromises.delete(scopes); + const body = await result.text(); + throw new Error(body); + } catch (e) { + throw new Error(`${result.status} ${result.statusText}`); } - }); - } - - private async doLoginWithLocalServer(scopes: string): Promise { - this._logger.info(`Trying with local server... (${scopes})`); - return await vscode.window.withProgress({ - location: vscode.ProgressLocation.Notification, - title: vscode.l10n.t({ - message: 'Signing in to {0}...', - args: [this.baseUri.authority], - comment: ['The {0} will be a url, e.g. github.com'] - }), - cancellable: true - }, async (_, token) => { - const redirectUri = await this.getRedirectEndpoint(); - const searchParams = new URLSearchParams([ - ['client_id', CLIENT_ID], - ['redirect_uri', redirectUri], - ['scope', scopes], - ]); - - const loginUrl = this.baseUri.with({ - path: '/login/oauth/authorize', - query: searchParams.toString() - }); - const server = new LoopbackAuthServer(path.join(__dirname, '../media'), loginUrl.toString(true)); - const port = await server.start(); - - let codeToExchange; - try { - vscode.env.openExternal(vscode.Uri.parse(`http://127.0.0.1:${port}/signin?nonce=${encodeURIComponent(server.nonce)}`)); - const { code } = await Promise.race([ - server.waitForOAuthResponse(), - new Promise((_, reject) => setTimeout(() => reject(TIMED_OUT_ERROR), 300_000)), // 5min timeout - promiseFromEvent(token.onCancellationRequested, (_, __, reject) => { reject(USER_CANCELLATION_ERROR); }).promise - ]); - codeToExchange = code; - } finally { - setTimeout(() => { - void server.stop(); - }, 5000); - } - - const accessToken = await this.exchangeCodeForToken(codeToExchange); - return accessToken; - }); - } - - private async doLoginDeviceCodeFlow(scopes: string): Promise { - this._logger.info(`Trying device code flow... (${scopes})`); - - // Get initial device code - const uri = this.baseUri.with({ - path: '/login/device/code', - query: `client_id=${CLIENT_ID}&scope=${scopes}` - }); - const result = await fetching(uri.toString(true), { - method: 'POST', - headers: { - Accept: 'application/json' - } - }); - if (!result.ok) { - throw new Error(`Failed to get one-time code: ${await result.text()}`); - } - - const json = await result.json() as IGitHubDeviceCodeResponse; - - const button = vscode.l10n.t('Copy & Continue to GitHub'); - const modalResult = await vscode.window.showInformationMessage( - vscode.l10n.t({ message: 'Your Code: {0}', args: [json.user_code], comment: ['The {0} will be a code, e.g. 123-456'] }), - { - modal: true, - detail: vscode.l10n.t('To finish authenticating, navigate to GitHub and paste in the above one-time code.') - }, button); - - if (modalResult !== button) { - throw new Error(USER_CANCELLATION_ERROR); - } - - await vscode.env.clipboard.writeText(json.user_code); - - const uriToOpen = await vscode.env.asExternalUri(vscode.Uri.parse(json.verification_uri)); - await vscode.env.openExternal(uriToOpen); - - return await this.waitForDeviceCodeAccessToken(json); - } - - private async doLoginWithPat(scopes: string): Promise { - this._logger.info(`Trying to retrieve PAT... (${scopes})`); - - const button = vscode.l10n.t('Continue to GitHub'); - const modalResult = await vscode.window.showInformationMessage( - vscode.l10n.t('Continue to GitHub to create a Personal Access Token (PAT)'), - { - modal: true, - detail: vscode.l10n.t('To finish authenticating, navigate to GitHub to create a PAT then paste the PAT into the input box.') - }, button); - - if (modalResult !== button) { - throw new Error(USER_CANCELLATION_ERROR); - } - - const description = `${vscode.env.appName} (${scopes})`; - const uriToOpen = await vscode.env.asExternalUri(this.baseUri.with({ path: '/settings/tokens/new', query: `description=${description}&scopes=${scopes.split(' ').join(',')}` })); - await vscode.env.openExternal(uriToOpen); - const token = await vscode.window.showInputBox({ placeHolder: `ghp_1a2b3c4...`, prompt: `GitHub Personal Access Token - ${scopes}`, ignoreFocusOut: true }); - if (!token) { throw new Error(USER_CANCELLATION_ERROR); } - - const tokenScopes = await getScopes(token, this.getServerUri('/'), this._logger); // Example: ['repo', 'user'] - const scopesList = scopes.split(' '); // Example: 'read:user repo user:email' - if (!scopesList.every(scope => { - const included = tokenScopes.includes(scope); - if (included || !scope.includes(':')) { - return included; - } - - return scope.split(':').some(splitScopes => { - return tokenScopes.includes(splitScopes); - }); - })) { - throw new Error(`The provided token does not match the requested scopes: ${scopes}`); - } - - return token; - } - - private async waitForDeviceCodeAccessToken( - json: IGitHubDeviceCodeResponse, - ): Promise { - return await vscode.window.withProgress({ - location: vscode.ProgressLocation.Notification, - cancellable: true, - title: vscode.l10n.t({ - message: 'Open [{0}]({0}) in a new tab and paste your one-time code: {1}', - args: [json.verification_uri, json.user_code], - comment: [ - 'The [{0}]({0}) will be a url and the {1} will be a code, e.g. 123-456', - '{Locked="[{0}]({0})"}' - ] - }) - }, async (_, token) => { - const refreshTokenUri = this.baseUri.with({ - path: '/login/oauth/access_token', - query: `client_id=${CLIENT_ID}&device_code=${json.device_code}&grant_type=urn:ietf:params:oauth:grant-type:device_code` - }); - - // Try for 2 minutes - const attempts = 120 / json.interval; - for (let i = 0; i < attempts; i++) { - await new Promise(resolve => setTimeout(resolve, json.interval * 1000)); - if (token.isCancellationRequested) { - throw new Error(USER_CANCELLATION_ERROR); - } - let accessTokenResult; - try { - accessTokenResult = await fetching(refreshTokenUri.toString(true), { - method: 'POST', - headers: { - Accept: 'application/json' - } - }); - } catch { - continue; - } - - if (!accessTokenResult.ok) { - continue; - } - - const accessTokenJson = await accessTokenResult.json(); - - if (accessTokenJson.error === 'authorization_pending') { - continue; - } - - if (accessTokenJson.error) { - throw new Error(accessTokenJson.error_description); - } - - return accessTokenJson.access_token; - } - - throw new Error(TIMED_OUT_ERROR); - }); - } - - private handleUri: (scopes: string) => PromiseAdapter = - (scopes) => (uri, resolve, reject) => { - const query = new URLSearchParams(uri.query); - const code = query.get('code'); - const nonce = query.get('nonce'); - if (!code) { - reject(new Error('No code')); - return; - } - if (!nonce) { - reject(new Error('No nonce')); - return; - } - - const acceptedNonces = this._pendingNonces.get(scopes) || []; - if (!acceptedNonces.includes(nonce)) { - // A common scenario of this happening is if you: - // 1. Trigger a sign in with one set of scopes - // 2. Before finishing 1, you trigger a sign in with a different set of scopes - // In this scenario we should just return and wait for the next UriHandler event - // to run as we are probably still waiting on the user to hit 'Continue' - this._logger.info('Nonce not found in accepted nonces. Skipping this execution...'); - return; - } - - resolve(this.exchangeCodeForToken(code)); - }; - - private async exchangeCodeForToken(code: string): Promise { - this._logger.info('Exchanging code for token...'); - - const proxyEndpoints: { [providerId: string]: string } | undefined = await vscode.commands.executeCommand('workbench.getCodeExchangeProxyEndpoints'); - const endpointUrl = proxyEndpoints?.github ? `${proxyEndpoints.github}login/oauth/access_token` : GITHUB_TOKEN_URL; - - const body = new URLSearchParams([['code', code]]); - if (this._type === AuthProviderType.githubEnterprise) { - body.append('github_enterprise', this.baseUri.toString(true)); - body.append('redirect_uri', await this.getRedirectEndpoint()); - } - const result = await fetching(endpointUrl, { - method: 'POST', - headers: { - Accept: 'application/json', - 'Content-Type': 'application/x-www-form-urlencoded', - 'Content-Length': body.toString() - - }, - body: body.toString() - }); - - if (result.ok) { - const json = await result.json(); - this._logger.info('Token exchange success!'); - return json.access_token; - } else { - const text = await result.text(); - const error = new Error(text); - error.name = 'GitHubTokenExchangeError'; - throw error; + } catch (e) { + this._logger.warn('Failed to delete token from server.' + e.message ?? e); } } diff --git a/extensions/github-authentication/src/node/buffer.ts b/extensions/github-authentication/src/node/buffer.ts new file mode 100644 index 00000000000..8e6208aa22a --- /dev/null +++ b/extensions/github-authentication/src/node/buffer.ts @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +export function base64Encode(text: string): string { + return Buffer.from(text, 'binary').toString('base64'); +} diff --git a/extensions/github-authentication/yarn.lock b/extensions/github-authentication/yarn.lock index 609eb719d50..752933d621f 100644 --- a/extensions/github-authentication/yarn.lock +++ b/extensions/github-authentication/yarn.lock @@ -364,9 +364,9 @@ node-fetch@2.6.7: whatwg-url "^5.0.0" semver@^5.3.0, semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== shimmer@^1.1.0, shimmer@^1.2.0: version "1.2.1" diff --git a/extensions/github/package.json b/extensions/github/package.json index 3da6c53904c..6e655fca983 100644 --- a/extensions/github/package.json +++ b/extensions/github/package.json @@ -8,6 +8,7 @@ "engines": { "vscode": "^1.41.0" }, + "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255", "icon": "images/icon.png", "categories": [ "Other" @@ -28,7 +29,8 @@ "enabledApiProposals": [ "contribShareMenu", "contribEditSessions", - "canonicalUriIdentityProvider" + "canonicalUriProvider", + "shareProvider" ], "contributes": { "commands": [ @@ -134,7 +136,7 @@ "github.branchProtection": { "type": "boolean", "scope": "resource", - "default": false, + "default": true, "description": "%config.branchProtection%" }, "github.gitAuthentication": { @@ -159,12 +161,12 @@ { "view": "scm", "contents": "%welcome.publishFolder%", - "when": "config.git.enabled && git.state == initialized && workbenchState == folder && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0" + "when": "config.git.enabled && git.state == initialized && workbenchState == folder && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0 && git.closedRepositoryCount == 0" }, { "view": "scm", "contents": "%welcome.publishWorkspaceFolder%", - "when": "config.git.enabled && git.state == initialized && workbenchState == workspace && workspaceFolderCount != 0 && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0" + "when": "config.git.enabled && git.state == initialized && workbenchState == workspace && workspaceFolderCount != 0 && git.parentRepositoryCount == 0 && git.unsafeRepositoryCount == 0 && git.closedRepositoryCount == 0" } ], "markdown.previewStyles": [ @@ -180,7 +182,8 @@ "@octokit/graphql": "5.0.5", "@octokit/graphql-schema": "14.4.0", "@octokit/rest": "19.0.4", - "tunnel": "^0.0.6" + "tunnel": "^0.0.6", + "@vscode/extension-telemetry": "0.7.5" }, "devDependencies": { "@types/node": "16.x" diff --git a/extensions/github/src/auth.ts b/extensions/github/src/auth.ts index 98b96ba8da7..e7be2637da0 100644 --- a/extensions/github/src/auth.ts +++ b/extensions/github/src/auth.ts @@ -59,10 +59,10 @@ export function getOctokit(): Promise { let _octokitGraphql: Promise | undefined; -export async function getOctokitGraphql(silent = false): Promise { +export async function getOctokitGraphql(): Promise { if (!_octokitGraphql) { try { - const session = await authentication.getSession('github', scopes, { silent }); + const session = await authentication.getSession('github', scopes, { silent: true }); if (!session) { throw new AuthenticationError('No GitHub authentication session available.'); diff --git a/extensions/github/src/branchProtection.ts b/extensions/github/src/branchProtection.ts index 0e64c3b7ca0..a7d18c41b9f 100644 --- a/extensions/github/src/branchProtection.ts +++ b/extensions/github/src/branchProtection.ts @@ -8,6 +8,7 @@ import { Repository as GitHubRepository, RepositoryRuleset } from '@octokit/grap import { AuthenticationError, getOctokitGraphql } from './auth'; import { API, BranchProtection, BranchProtectionProvider, BranchProtectionRule, Repository } from './typings/git'; import { DisposableStore, getRepositoryFromUrl } from './util'; +import TelemetryReporter from '@vscode/extension-telemetry'; const REPOSITORY_QUERY = ` query repositoryPermissions($owner: String!, $repo: String!) { @@ -60,7 +61,7 @@ export class GithubBranchProtectionProviderManager { if (enabled) { for (const repository of this.gitAPI.repositories) { - this.providerDisposables.add(this.gitAPI.registerBranchProtectionProvider(repository.rootUri, new GithubBranchProtectionProvider(repository, this.globalState, this.logger))); + this.providerDisposables.add(this.gitAPI.registerBranchProtectionProvider(repository.rootUri, new GithubBranchProtectionProvider(repository, this.globalState, this.logger, this.telemetryReporter))); } } else { this.providerDisposables.dispose(); @@ -72,10 +73,11 @@ export class GithubBranchProtectionProviderManager { constructor( private readonly gitAPI: API, private readonly globalState: Memento, - private readonly logger: LogOutputChannel) { + private readonly logger: LogOutputChannel, + private readonly telemetryReporter: TelemetryReporter) { this.disposables.add(this.gitAPI.onDidOpenRepository(repository => { if (this._enabled) { - this.providerDisposables.add(gitAPI.registerBranchProtectionProvider(repository.rootUri, new GithubBranchProtectionProvider(repository, this.globalState, this.logger))); + this.providerDisposables.add(gitAPI.registerBranchProtectionProvider(repository.rootUri, new GithubBranchProtectionProvider(repository, this.globalState, this.logger, this.telemetryReporter))); } })); @@ -110,14 +112,15 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider constructor( private readonly repository: Repository, private readonly globalState: Memento, - private readonly logger: LogOutputChannel) { + private readonly logger: LogOutputChannel, + private readonly telemetryReporter: TelemetryReporter) { // Restore branch protection from global state this.branchProtection = this.globalState.get(this.globalStateKey, []); repository.status().then(() => { authentication.onDidChangeSessions(e => { if (e.provider.id === 'github') { - this.updateRepositoryBranchProtection(true); + this.updateRepositoryBranchProtection(); } }); this.updateRepositoryBranchProtection(); @@ -128,18 +131,18 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider return this.branchProtection; } - private async getRepositoryDetails(owner: string, repo: string, silent: boolean): Promise { - const graphql = await getOctokitGraphql(silent); + private async getRepositoryDetails(owner: string, repo: string): Promise { + const graphql = await getOctokitGraphql(); const { repository } = await graphql<{ repository: GitHubRepository }>(REPOSITORY_QUERY, { owner, repo }); return repository; } - private async getRepositoryRulesets(owner: string, repo: string, silent: boolean): Promise { + private async getRepositoryRulesets(owner: string, repo: string): Promise { const rulesets: RepositoryRuleset[] = []; let cursor: string | undefined = undefined; - const graphql = await getOctokitGraphql(silent); + const graphql = await getOctokitGraphql(); while (true) { const { repository } = await graphql<{ repository: GitHubRepository }>(REPOSITORY_RULESETS_QUERY, { owner, repo, cursor }); @@ -158,7 +161,7 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider return rulesets; } - private async updateRepositoryBranchProtection(silent = false): Promise { + private async updateRepositoryBranchProtection(): Promise { const branchProtection: BranchProtection[] = []; try { @@ -171,7 +174,7 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider // Repository details this.logger.trace(`Fetching repository details for "${repository.owner}/${repository.repo}".`); - const repositoryDetails = await this.getRepositoryDetails(repository.owner, repository.repo, silent); + const repositoryDetails = await this.getRepositoryDetails(repository.owner, repository.repo); // Check repository write permission if (repositoryDetails.viewerPermission !== 'ADMIN' && repositoryDetails.viewerPermission !== 'MAINTAIN' && repositoryDetails.viewerPermission !== 'WRITE') { @@ -181,7 +184,7 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider // Get repository rulesets const branchProtectionRules: BranchProtectionRule[] = []; - const repositoryRulesets = await this.getRepositoryRulesets(repository.owner, repository.repo, silent); + const repositoryRulesets = await this.getRepositoryRulesets(repository.owner, repository.repo); for (const ruleset of repositoryRulesets) { branchProtectionRules.push({ @@ -199,17 +202,27 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider // Save branch protection to global state await this.globalState.update(this.globalStateKey, branchProtection); this.logger.trace(`Branch protection for "${this.repository.rootUri.toString()}": ${JSON.stringify(branchProtection)}.`); + + /* __GDPR__ + "branchProtection" : { + "owner": "lszomoru", + "rulesetCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true, "comment": "Number of repository rulesets" } + } + */ + this.telemetryReporter.sendTelemetryEvent('branchProtection', undefined, { rulesetCount: this.branchProtection.length }); } catch (err) { this.logger.warn(`Failed to update repository branch protection: ${err.message}`); if (err instanceof AuthenticationError) { // A GitHub authentication session could be missing if the user has not yet - // signed in with their GitHub account or they have signed out. In this case - // we have to clear the branch protection information. - this.branchProtection = branchProtection; - this._onDidChangeBranchProtection.fire(this.repository.rootUri); + // signed in with their GitHub account or they have signed out. If there is + // branch protection information we have to clear it. + if (this.branchProtection.length !== 0) { + this.branchProtection = branchProtection; + this._onDidChangeBranchProtection.fire(this.repository.rootUri); - await this.globalState.update(this.globalStateKey, undefined); + await this.globalState.update(this.globalStateKey, undefined); + } } } } diff --git a/extensions/github/src/canonicalUriIdentityProvider.ts b/extensions/github/src/canonicalUriIdentityProvider.ts deleted file mode 100644 index 89c9585c1f6..00000000000 --- a/extensions/github/src/canonicalUriIdentityProvider.ts +++ /dev/null @@ -1,37 +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 { CancellationToken, CanonicalUriIdentityProvider, Disposable, Uri, workspace } from 'vscode'; - -const SUPPORTED_SCHEMES = ['ssh', 'https']; - -export class GitHubCanonicalUriIdentityProvider implements CanonicalUriIdentityProvider { - - private disposables: Disposable[] = []; - constructor() { - this.disposables.push(...SUPPORTED_SCHEMES.map((scheme) => workspace.registerCanonicalUriIdentityProvider(scheme, this))); - } - - dispose() { this.disposables.forEach((disposable) => disposable.dispose()); } - - async provideCanonicalUriIdentity(uri: Uri, _token: CancellationToken): Promise { - switch (uri.scheme) { - case 'ssh': - // if this is a git@github.com URI, return the HTTPS equivalent - if (uri.authority === 'git@github.com') { - const [owner, repo] = (uri.path.endsWith('.git') ? uri.path.slice(0, -4) : uri.path).split('/').filter((segment) => segment.length > 0); - return Uri.parse(`https://github.com/${owner}/${repo}`); - } - break; - case 'https': - if (uri.authority === 'github.com') { - return uri; - } - break; - } - - return undefined; - } -} diff --git a/extensions/github/src/canonicalUriProvider.ts b/extensions/github/src/canonicalUriProvider.ts new file mode 100644 index 00000000000..09f5e243bc1 --- /dev/null +++ b/extensions/github/src/canonicalUriProvider.ts @@ -0,0 +1,49 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { CancellationToken, CanonicalUriProvider, CanonicalUriRequestOptions, Disposable, ProviderResult, Uri, workspace } from 'vscode'; +import { API } from './typings/git'; + +const SUPPORTED_SCHEMES = ['ssh', 'https', 'file']; + +export class GitHubCanonicalUriProvider implements CanonicalUriProvider { + + private disposables: Disposable[] = []; + constructor(private gitApi: API) { + this.disposables.push(...SUPPORTED_SCHEMES.map((scheme) => workspace.registerCanonicalUriProvider(scheme, this))); + } + + dispose() { this.disposables.forEach((disposable) => disposable.dispose()); } + + provideCanonicalUri(uri: Uri, options: CanonicalUriRequestOptions, _token: CancellationToken): ProviderResult { + if (options.targetScheme !== 'https') { + return; + } + + switch (uri.scheme) { + case 'file': { + const repository = this.gitApi.getRepository(uri); + const remote = repository?.state.remotes.find((remote) => remote.name === repository.state.HEAD?.remote)?.pushUrl?.replace(/^(git@[^\/:]+)(:)/i, 'ssh://$1/'); + if (remote) { + return toHttpsGitHubRemote(uri); + } + } + default: + return toHttpsGitHubRemote(uri); + } + } +} + +function toHttpsGitHubRemote(uri: Uri) { + if (uri.scheme === 'ssh' && uri.authority === 'git@github.com') { + // if this is a git@github.com URI, return the HTTPS equivalent + const [owner, repo] = (uri.path.endsWith('.git') ? uri.path.slice(0, -4) : uri.path).split('/').filter((segment) => segment.length > 0); + return Uri.parse(`https://github.com/${owner}/${repo}`); + } + if (uri.scheme === 'https' && uri.authority === 'github.com') { + return uri; + } + return undefined; +} diff --git a/extensions/github/src/commands.ts b/extensions/github/src/commands.ts index 8a653e523c4..1f1504521f8 100644 --- a/extensions/github/src/commands.ts +++ b/extensions/github/src/commands.ts @@ -7,29 +7,29 @@ import * as vscode from 'vscode'; import { API as GitAPI } from './typings/git'; import { publishRepository } from './publish'; import { DisposableStore } from './util'; -import { LinkContext, getLink } from './links'; - -function getVscodeDevHost(): string { - return `https://${vscode.env.appName.toLowerCase().includes('insiders') ? 'insiders.' : ''}vscode.dev/github`; -} +import { LinkContext, getLink, getVscodeDevHost } from './links'; async function copyVscodeDevLink(gitAPI: GitAPI, useSelection: boolean, context: LinkContext, includeRange = true) { try { - const permalink = getLink(gitAPI, useSelection, getVscodeDevHost(), 'headlink', context, includeRange); + const permalink = await getLink(gitAPI, useSelection, true, getVscodeDevHost(), 'headlink', context, includeRange); if (permalink) { return vscode.env.clipboard.writeText(permalink); } } catch (err) { - vscode.window.showErrorMessage(err.message); + if (!(err instanceof vscode.CancellationError)) { + vscode.window.showErrorMessage(err.message); + } } } async function openVscodeDevLink(gitAPI: GitAPI): Promise { try { - const headlink = getLink(gitAPI, true, getVscodeDevHost(), 'headlink'); + const headlink = await getLink(gitAPI, true, false, getVscodeDevHost(), 'headlink'); return headlink ? vscode.Uri.parse(headlink) : undefined; } catch (err) { - vscode.window.showErrorMessage(err.message); + if (!(err instanceof vscode.CancellationError)) { + vscode.window.showErrorMessage(err.message); + } return undefined; } } diff --git a/extensions/github/src/extension.ts b/extensions/github/src/extension.ts index 26ed3bb39b7..1827768312e 100644 --- a/extensions/github/src/extension.ts +++ b/extensions/github/src/extension.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { commands, Disposable, ExtensionContext, extensions, l10n, LogLevel, LogOutputChannel, window } from 'vscode'; +import TelemetryReporter from '@vscode/extension-telemetry'; import { GithubRemoteSourceProvider } from './remoteSourceProvider'; import { API, GitExtension } from './typings/git'; import { registerCommands } from './commands'; @@ -13,7 +14,8 @@ import { GithubPushErrorHandler } from './pushErrorHandler'; import { GitBaseExtension } from './typings/git-base'; import { GithubRemoteSourcePublisher } from './remoteSourcePublisher'; import { GithubBranchProtectionProviderManager } from './branchProtection'; -import { GitHubCanonicalUriIdentityProvider } from './canonicalUriIdentityProvider'; +import { GitHubCanonicalUriProvider } from './canonicalUriProvider'; +import { VscodeDevShareProvider } from './shareProviders'; export function activate(context: ExtensionContext): void { const disposables: Disposable[] = []; @@ -28,9 +30,12 @@ export function activate(context: ExtensionContext): void { disposables.push(logger.onDidChangeLogLevel(onDidChangeLogLevel)); onDidChangeLogLevel(logger.logLevel); + const { aiKey } = require('../package.json') as { aiKey: string }; + const telemetryReporter = new TelemetryReporter(aiKey); + disposables.push(telemetryReporter); + disposables.push(initializeGitBaseExtension()); - disposables.push(initializeGitExtension(context, logger)); - disposables.push(new GitHubCanonicalUriIdentityProvider()); + disposables.push(initializeGitExtension(context, telemetryReporter, logger)); } function initializeGitBaseExtension(): Disposable { @@ -78,7 +83,7 @@ function setGitHubContext(gitAPI: API, disposables: DisposableStore) { } } -function initializeGitExtension(context: ExtensionContext, logger: LogOutputChannel): Disposable { +function initializeGitExtension(context: ExtensionContext, telemetryReporter: TelemetryReporter, logger: LogOutputChannel): Disposable { const disposables = new DisposableStore(); let gitExtension = extensions.getExtension('vscode.git'); @@ -92,9 +97,11 @@ function initializeGitExtension(context: ExtensionContext, logger: LogOutputChan disposables.add(registerCommands(gitAPI)); disposables.add(new GithubCredentialProviderManager(gitAPI)); - disposables.add(new GithubBranchProtectionProviderManager(gitAPI, context.globalState, logger)); - disposables.add(gitAPI.registerPushErrorHandler(new GithubPushErrorHandler())); + disposables.add(new GithubBranchProtectionProviderManager(gitAPI, context.globalState, logger, telemetryReporter)); + disposables.add(gitAPI.registerPushErrorHandler(new GithubPushErrorHandler(telemetryReporter))); disposables.add(gitAPI.registerRemoteSourcePublisher(new GithubRemoteSourcePublisher(gitAPI))); + disposables.add(new GitHubCanonicalUriProvider(gitAPI)); + disposables.add(new VscodeDevShareProvider(gitAPI)); setGitHubContext(gitAPI, disposables); commands.executeCommand('setContext', 'git-base.gitEnabled', true); diff --git a/extensions/github/src/links.ts b/extensions/github/src/links.ts index 455662baf18..911f0e5376b 100644 --- a/extensions/github/src/links.ts +++ b/extensions/github/src/links.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { API as GitAPI, Repository } from './typings/git'; -import { getRepositoryFromUrl } from './util'; +import { API as GitAPI, RefType, Repository } from './typings/git'; +import { getRepositoryFromUrl, repositoryHasGitHubRemote } from './util'; export function isFileInRepo(repository: Repository, file: vscode.Uri): boolean { return file.path.toLowerCase() === repository.rootUri.path.toLowerCase() || @@ -92,7 +92,7 @@ function getRangeOrSelection(lineNumber: number | undefined) { : vscode.window.activeTextEditor?.selection; } -function rangeString(range: vscode.Range | undefined) { +export function rangeString(range: vscode.Range | undefined) { if (!range) { return ''; } @@ -119,7 +119,7 @@ export function notebookCellRangeString(index: number | undefined, range: vscode return hash; } -function encodeURIComponentExceptSlashes(path: string) { +export function encodeURIComponentExceptSlashes(path: string) { // There may be special characters like # and whitespace in the path. // These characters are not escaped by encodeURI(), so it is not sufficient to // feed the full URI to encodeURI(). @@ -129,19 +129,22 @@ function encodeURIComponentExceptSlashes(path: string) { return path.split('/').map((segment) => encodeURIComponent(segment)).join('/'); } -export function getLink(gitAPI: GitAPI, useSelection: boolean, hostPrefix?: string, linkType: 'permalink' | 'headlink' = 'permalink', context?: LinkContext, useRange?: boolean): string | undefined { +export async function getLink(gitAPI: GitAPI, useSelection: boolean, shouldEnsurePublished: boolean, hostPrefix?: string, linkType: 'permalink' | 'headlink' = 'permalink', context?: LinkContext, useRange?: boolean): Promise { hostPrefix = hostPrefix ?? 'https://github.com'; const fileAndPosition = getFileAndPosition(context); - if (!fileAndPosition) { - return; - } - const uri = fileAndPosition.uri; + const fileUri = fileAndPosition?.uri; // Use the first repo if we cannot determine a repo from the uri. - const gitRepo = (uri ? getRepositoryForFile(gitAPI, uri) : gitAPI.repositories[0]) ?? gitAPI.repositories[0]; + const githubRepository = gitAPI.repositories.find(repo => repositoryHasGitHubRemote(repo)); + const gitRepo = (fileUri ? getRepositoryForFile(gitAPI, fileUri) : githubRepository) ?? githubRepository; if (!gitRepo) { return; } + + if (shouldEnsurePublished && fileUri) { + await ensurePublished(gitRepo, fileUri); + } + let repo: { owner: string; repo: string } | undefined; gitRepo.state.remotes.find(remote => { if (remote.fetchUrl) { @@ -160,11 +163,94 @@ export function getLink(gitAPI: GitAPI, useSelection: boolean, hostPrefix?: stri } const blobSegment = gitRepo.state.HEAD ? (`/blob/${linkType === 'headlink' && gitRepo.state.HEAD.name ? encodeURIComponentExceptSlashes(gitRepo.state.HEAD.name) : gitRepo.state.HEAD?.commit}`) : ''; - const encodedFilePath = encodeURIComponentExceptSlashes(uri.path.substring(gitRepo.rootUri.path.length)); + const uriWithoutFileSegments = `${hostPrefix}/${repo.owner}/${repo.repo}${blobSegment}`; + if (!fileUri) { + return uriWithoutFileSegments; + } + + const encodedFilePath = encodeURIComponentExceptSlashes(fileUri.path.substring(gitRepo.rootUri.path.length)); const fileSegments = fileAndPosition.type === LinkType.File ? (useSelection ? `${encodedFilePath}${useRange ? rangeString(fileAndPosition.range) : ''}` : '') : (useSelection ? `${encodedFilePath}${useRange ? notebookCellRangeString(fileAndPosition.cellIndex, fileAndPosition.range) : ''}` : ''); - return `${hostPrefix}/${repo.owner}/${repo.repo}${blobSegment - }${fileSegments}`; + return `${uriWithoutFileSegments}${fileSegments}`; +} + +export function getBranchLink(url: string, branch: string, hostPrefix: string = 'https://github.com') { + const repo = getRepositoryFromUrl(url); + if (!repo) { + throw new Error('Invalid repository URL provided'); + } + + branch = encodeURIComponentExceptSlashes(branch); + return `${hostPrefix}/${repo.owner}/${repo.repo}/tree/${branch}`; +} + +export function getVscodeDevHost(): string { + return `https://${vscode.env.appName.toLowerCase().includes('insiders') ? 'insiders.' : ''}vscode.dev/github`; +} + +export async function ensurePublished(repository: Repository, file: vscode.Uri) { + await repository.status(); + + if ((repository.state.HEAD?.type === RefType.Head || repository.state.HEAD?.type === RefType.Tag) + // If HEAD is not published, make sure it is + && !repository?.state.HEAD?.upstream + ) { + const publishBranch = vscode.l10n.t('Publish Branch & Copy Link'); + const selection = await vscode.window.showInformationMessage( + vscode.l10n.t('The current branch is not published to the remote. Would you like to publish your branch before copying a link?'), + { modal: true }, + publishBranch + ); + if (selection !== publishBranch) { + throw new vscode.CancellationError(); + } + + await vscode.commands.executeCommand('git.publish'); + } + + const uncommittedChanges = [...repository.state.workingTreeChanges, ...repository.state.indexChanges]; + if (uncommittedChanges.find((c) => c.uri.toString() === file.toString()) && !repository.state.HEAD?.ahead && !repository.state.HEAD?.behind) { + const commitChanges = vscode.l10n.t('Commit Changes'); + const copyAnyway = vscode.l10n.t('Copy Anyway'); + const selection = await vscode.window.showWarningMessage( + vscode.l10n.t('The current file has uncommitted changes. Please commit your changes before copying a link.'), + { modal: true }, + commitChanges, + copyAnyway + ); + + if (selection !== copyAnyway) { + // Focus the SCM view + vscode.commands.executeCommand('workbench.view.scm'); + throw new vscode.CancellationError(); + } + } else if (repository.state.HEAD?.ahead) { + const pushCommits = vscode.l10n.t('Push Commits & Copy Link'); + const selection = await vscode.window.showInformationMessage( + vscode.l10n.t('The current branch has unpublished commits. Would you like to push your commits before copying a link?'), + { modal: true }, + pushCommits + ); + if (selection !== pushCommits) { + throw new vscode.CancellationError(); + } + + await repository.push(); + } else if (repository.state.HEAD?.behind) { + const pull = vscode.l10n.t('Pull Changes & Copy Link'); + const selection = await vscode.window.showInformationMessage( + vscode.l10n.t('The current branch is not up to date. Would you like to pull before copying a link?'), + { modal: true }, + pull + ); + if (selection !== pull) { + throw new vscode.CancellationError(); + } + + await repository.pull(); + } + + await repository.status(); } diff --git a/extensions/github/src/publish.ts b/extensions/github/src/publish.ts index 3f24b1061cc..dee8898d348 100644 --- a/extensions/github/src/publish.ts +++ b/extensions/github/src/publish.ts @@ -190,7 +190,7 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository) progress.report({ message: vscode.l10n.t('Creating first commit'), increment: 25 }); if (!repository) { - repository = await gitAPI.init(folder) || undefined; + repository = await gitAPI.init(folder, { defaultBranch: createdGithubRepository.default_branch }) || undefined; if (!repository) { return; diff --git a/extensions/github/src/pushErrorHandler.ts b/extensions/github/src/pushErrorHandler.ts index 6d4b4112811..f1702bf15dd 100644 --- a/extensions/github/src/pushErrorHandler.ts +++ b/extensions/github/src/pushErrorHandler.ts @@ -4,7 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { TextDecoder } from 'util'; -import { commands, env, ProgressLocation, Uri, window, workspace, QuickPickOptions, FileType, l10n } from 'vscode'; +import { commands, env, ProgressLocation, Uri, window, workspace, QuickPickOptions, FileType, l10n, Disposable, TextDocumentContentProvider } from 'vscode'; +import TelemetryReporter from '@vscode/extension-telemetry'; import { getOctokit } from './auth'; import { GitErrorCodes, PushErrorHandler, Remote, Repository } from './typings/git'; import * as path from 'path'; @@ -15,136 +16,6 @@ export function isInCodespaces(): boolean { return env.remoteName === 'codespaces'; } -async function handlePushError(repository: Repository, remote: Remote, refspec: string, owner: string, repo: string): Promise { - const yes = l10n.t('Create Fork'); - const no = l10n.t('No'); - const askFork = l10n.t('You don\'t have permissions to push to "{0}/{1}" on GitHub. Would you like to create a fork and push to it instead?', owner, repo); - - const answer = await window.showWarningMessage(askFork, { modal: true }, yes, no); - if (answer !== yes) { - return; - } - - const match = /^([^:]*):([^:]*)$/.exec(refspec); - const localName = match ? match[1] : refspec; - let remoteName = match ? match[2] : refspec; - - const [octokit, ghRepository] = await window.withProgress({ location: ProgressLocation.Notification, cancellable: false, title: l10n.t('Create GitHub fork') }, async progress => { - progress.report({ message: l10n.t('Forking "{0}/{1}"...', owner, repo), increment: 33 }); - - const octokit = await getOctokit(); - - type CreateForkResponseData = Awaited>['data']; - - // Issue: what if the repo already exists? - let ghRepository: CreateForkResponseData; - try { - if (isInCodespaces()) { - // Call into the codespaces extension to fork the repository - const resp = await commands.executeCommand<{ repository: CreateForkResponseData; ref: string }>('github.codespaces.forkRepository'); - if (!resp) { - throw new Error('Unable to fork respository'); - } - - ghRepository = resp.repository; - - if (resp.ref) { - let ref = resp.ref; - if (ref.startsWith('refs/heads/')) { - ref = ref.substr(11); - } - - remoteName = ref; - } - } else { - const resp = await octokit.repos.createFork({ owner, repo }); - ghRepository = resp.data; - } - } catch (ex) { - console.error(ex); - throw ex; - } - - progress.report({ message: l10n.t('Pushing changes...'), increment: 33 }); - - // Issue: what if there's already an `upstream` repo? - await repository.renameRemote(remote.name, 'upstream'); - - // Issue: what if there's already another `origin` repo? - const protocol = workspace.getConfiguration('github').get<'https' | 'ssh'>('gitProtocol'); - const remoteUrl = protocol === 'https' ? ghRepository.clone_url : ghRepository.ssh_url; - await repository.addRemote('origin', remoteUrl); - - try { - await repository.fetch('origin', remoteName); - await repository.setBranchUpstream(localName, `origin/${remoteName}`); - } catch { - // noop - } - - await repository.push('origin', localName, true); - - return [octokit, ghRepository] as const; - }); - - // yield - (async () => { - const openOnGitHub = l10n.t('Open on GitHub'); - const createPR = l10n.t('Create PR'); - const action = await window.showInformationMessage(l10n.t('The fork "{0}" was successfully created on GitHub.', ghRepository.full_name), openOnGitHub, createPR); - - if (action === openOnGitHub) { - await commands.executeCommand('vscode.open', Uri.parse(ghRepository.html_url)); - } else if (action === createPR) { - const pr = await window.withProgress({ location: ProgressLocation.Notification, cancellable: false, title: l10n.t('Creating GitHub Pull Request...') }, async _ => { - let title = `Update ${remoteName}`; - const head = repository.state.HEAD?.name; - - let body: string | undefined; - - if (head) { - const commit = await repository.getCommit(head); - title = commit.message.split('\n')[0]; - body = commit.message.slice(title.length + 1).trim(); - } - - const templates = await findPullRequestTemplates(repository.rootUri); - if (templates.length > 0) { - templates.sort((a, b) => a.path.localeCompare(b.path)); - - const template = await pickPullRequestTemplate(repository.rootUri, templates); - - if (template) { - body = new TextDecoder('utf-8').decode(await workspace.fs.readFile(template)); - } - } - - const { data: pr } = await octokit.pulls.create({ - owner, - repo, - title, - body, - head: `${ghRepository.owner.login}:${remoteName}`, - base: ghRepository.default_branch - }); - - await repository.setConfig(`branch.${localName}.remote`, 'upstream'); - await repository.setConfig(`branch.${localName}.merge`, `refs/heads/${remoteName}`); - await repository.setConfig(`branch.${localName}.github-pr-owner-number`, `${owner}#${repo}#${pr.number}`); - - return pr; - }); - - const openPR = l10n.t('Open PR'); - const action = await window.showInformationMessage(l10n.t('The PR "{0}/{1}#{2}" was successfully created on GitHub.', owner, repo, pr.number), openPR); - - if (action === openPR) { - await commands.executeCommand('vscode.open', Uri.parse(pr.html_url)); - } - } - })(); -} - const PR_TEMPLATE_FILES = [ { dir: '.', files: ['pull_request_template.md', 'PULL_REQUEST_TEMPLATE.md'] }, { dir: 'docs', files: ['pull_request_template.md', 'PULL_REQUEST_TEMPLATE.md'] }, @@ -207,10 +78,34 @@ export async function pickPullRequestTemplate(repositoryRootUri: Uri, templates: return pickedTemplate?.template; } +class CommandErrorOutputTextDocumentContentProvider implements TextDocumentContentProvider { + + private items = new Map(); + + set(uri: Uri, contents: string): void { + this.items.set(uri.path, contents); + } + + delete(uri: Uri): void { + this.items.delete(uri.path); + } + + provideTextDocumentContent(uri: Uri): string | undefined { + return this.items.get(uri.path); + } +} + export class GithubPushErrorHandler implements PushErrorHandler { - async handlePushError(repository: Repository, remote: Remote, refspec: string, error: Error & { gitErrorCode: GitErrorCodes }): Promise { - if (error.gitErrorCode !== GitErrorCodes.PermissionDenied) { + private disposables: Disposable[] = []; + private commandErrors = new CommandErrorOutputTextDocumentContentProvider(); + + constructor(private readonly telemetryReporter: TelemetryReporter) { + this.disposables.push(workspace.registerTextDocumentContentProvider('github-output', this.commandErrors)); + } + + async handlePushError(repository: Repository, remote: Remote, refspec: string, error: Error & { stderr: string; gitErrorCode: GitErrorCodes }): Promise { + if (error.gitErrorCode !== GitErrorCodes.PermissionDenied && error.gitErrorCode !== GitErrorCodes.PushRejected) { return false; } @@ -229,8 +124,201 @@ export class GithubPushErrorHandler implements PushErrorHandler { } const [, owner, repo] = match; - await handlePushError(repository, remote, refspec, owner, repo); - return true; + if (error.gitErrorCode === GitErrorCodes.PermissionDenied) { + await this.handlePermissionDeniedError(repository, remote, refspec, owner, repo); + + /* __GDPR__ + "pushErrorHandler" : { + "owner": "lszomoru", + "handler": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + } + */ + this.telemetryReporter.sendTelemetryEvent('pushErrorHandler', { handler: 'PermissionDenied' }); + + return true; + } + + // Push protection + if (/GH009: Secrets detected!/i.test(error.stderr)) { + await this.handlePushProtectionError(owner, repo, error.stderr); + + /* __GDPR__ + "pushErrorHandler" : { + "owner": "lszomoru", + "handler": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + } + */ + this.telemetryReporter.sendTelemetryEvent('pushErrorHandler', { handler: 'PushRejected.PushProtection' }); + + return true; + } + + /* __GDPR__ + "pushErrorHandler" : { + "owner": "lszomoru", + "handler": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + } + */ + this.telemetryReporter.sendTelemetryEvent('pushErrorHandler', { handler: 'None' }); + + return false; + } + + private async handlePermissionDeniedError(repository: Repository, remote: Remote, refspec: string, owner: string, repo: string): Promise { + const yes = l10n.t('Create Fork'); + const no = l10n.t('No'); + const askFork = l10n.t('You don\'t have permissions to push to "{0}/{1}" on GitHub. Would you like to create a fork and push to it instead?', owner, repo); + + const answer = await window.showWarningMessage(askFork, { modal: true }, yes, no); + if (answer !== yes) { + return; + } + + const match = /^([^:]*):([^:]*)$/.exec(refspec); + const localName = match ? match[1] : refspec; + let remoteName = match ? match[2] : refspec; + + const [octokit, ghRepository] = await window.withProgress({ location: ProgressLocation.Notification, cancellable: false, title: l10n.t('Create GitHub fork') }, async progress => { + progress.report({ message: l10n.t('Forking "{0}/{1}"...', owner, repo), increment: 33 }); + + const octokit = await getOctokit(); + + type CreateForkResponseData = Awaited>['data']; + + // Issue: what if the repo already exists? + let ghRepository: CreateForkResponseData; + try { + if (isInCodespaces()) { + // Call into the codespaces extension to fork the repository + const resp = await commands.executeCommand<{ repository: CreateForkResponseData; ref: string }>('github.codespaces.forkRepository'); + if (!resp) { + throw new Error('Unable to fork respository'); + } + + ghRepository = resp.repository; + + if (resp.ref) { + let ref = resp.ref; + if (ref.startsWith('refs/heads/')) { + ref = ref.substr(11); + } + + remoteName = ref; + } + } else { + const resp = await octokit.repos.createFork({ owner, repo }); + ghRepository = resp.data; + } + } catch (ex) { + console.error(ex); + throw ex; + } + + progress.report({ message: l10n.t('Pushing changes...'), increment: 33 }); + + // Issue: what if there's already an `upstream` repo? + await repository.renameRemote(remote.name, 'upstream'); + + // Issue: what if there's already another `origin` repo? + const protocol = workspace.getConfiguration('github').get<'https' | 'ssh'>('gitProtocol'); + const remoteUrl = protocol === 'https' ? ghRepository.clone_url : ghRepository.ssh_url; + await repository.addRemote('origin', remoteUrl); + + try { + await repository.fetch('origin', remoteName); + await repository.setBranchUpstream(localName, `origin/${remoteName}`); + } catch { + // noop + } + + await repository.push('origin', localName, true); + + return [octokit, ghRepository] as const; + }); + + // yield + (async () => { + const openOnGitHub = l10n.t('Open on GitHub'); + const createPR = l10n.t('Create PR'); + const action = await window.showInformationMessage(l10n.t('The fork "{0}" was successfully created on GitHub.', ghRepository.full_name), openOnGitHub, createPR); + + if (action === openOnGitHub) { + await commands.executeCommand('vscode.open', Uri.parse(ghRepository.html_url)); + } else if (action === createPR) { + const pr = await window.withProgress({ location: ProgressLocation.Notification, cancellable: false, title: l10n.t('Creating GitHub Pull Request...') }, async _ => { + let title = `Update ${remoteName}`; + const head = repository.state.HEAD?.name; + + let body: string | undefined; + + if (head) { + const commit = await repository.getCommit(head); + title = commit.message.split('\n')[0]; + body = commit.message.slice(title.length + 1).trim(); + } + + const templates = await findPullRequestTemplates(repository.rootUri); + if (templates.length > 0) { + templates.sort((a, b) => a.path.localeCompare(b.path)); + + const template = await pickPullRequestTemplate(repository.rootUri, templates); + + if (template) { + body = new TextDecoder('utf-8').decode(await workspace.fs.readFile(template)); + } + } + + const { data: pr } = await octokit.pulls.create({ + owner, + repo, + title, + body, + head: `${ghRepository.owner.login}:${remoteName}`, + base: ghRepository.default_branch + }); + + await repository.setConfig(`branch.${localName}.remote`, 'upstream'); + await repository.setConfig(`branch.${localName}.merge`, `refs/heads/${remoteName}`); + await repository.setConfig(`branch.${localName}.github-pr-owner-number`, `${owner}#${repo}#${pr.number}`); + + return pr; + }); + + const openPR = l10n.t('Open PR'); + const action = await window.showInformationMessage(l10n.t('The PR "{0}/{1}#{2}" was successfully created on GitHub.', owner, repo, pr.number), openPR); + + if (action === openPR) { + await commands.executeCommand('vscode.open', Uri.parse(pr.html_url)); + } + } + })(); + } + + private async handlePushProtectionError(owner: string, repo: string, stderr: string): Promise { + // Open command output in an editor + const timestamp = new Date().getTime(); + const uri = Uri.parse(`github-output:/github-error-${timestamp}`); + this.commandErrors.set(uri, stderr); + + try { + const doc = await workspace.openTextDocument(uri); + await window.showTextDocument(doc); + } + finally { + this.commandErrors.set(uri, stderr); + } + + // Show dialog + const learnMore = l10n.t('Learn More'); + const message = l10n.t('Your push to "{0}/{1}" was rejected by GitHub because push protection is enabled and one or more secrets were detected.', owner, repo); + const answer = await window.showWarningMessage(message, { modal: true }, learnMore); + if (answer === learnMore) { + commands.executeCommand('vscode.open', 'https://aka.ms/vscode-github-push-protection'); + } + } + + dispose() { + this.disposables.forEach(d => d.dispose()); } } diff --git a/extensions/github/src/remoteSourceProvider.ts b/extensions/github/src/remoteSourceProvider.ts index e8eeb851549..0d8b9340695 100644 --- a/extensions/github/src/remoteSourceProvider.ts +++ b/extensions/github/src/remoteSourceProvider.ts @@ -3,11 +3,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { workspace } from 'vscode'; -import { RemoteSourceProvider, RemoteSource } from './typings/git-base'; +import { Uri, env, l10n, workspace } from 'vscode'; +import { RemoteSourceProvider, RemoteSource, RemoteSourceAction } from './typings/git-base'; import { getOctokit } from './auth'; import { Octokit } from '@octokit/rest'; import { getRepositoryFromQuery, getRepositoryFromUrl } from './util'; +import { getBranchLink, getVscodeDevHost } from './links'; function asRemoteSource(raw: any): RemoteSource { const protocol = workspace.getConfiguration('github').get<'https' | 'ssh'>('gitProtocol'); @@ -112,4 +113,27 @@ export class GithubRemoteSourceProvider implements RemoteSourceProvider { return branches.sort((a, b) => a === defaultBranch ? -1 : b === defaultBranch ? 1 : 0); } + + async getRemoteSourceActions(url: string): Promise { + const repository = getRepositoryFromUrl(url); + if (!repository) { + return []; + } + + return [{ + label: l10n.t('Open on GitHub'), + icon: 'github', + run(branch: string) { + const link = getBranchLink(url, branch); + env.openExternal(Uri.parse(link)); + } + }, { + label: l10n.t('Checkout on vscode.dev'), + icon: 'globe', + run(branch: string) { + const link = getBranchLink(url, branch, getVscodeDevHost()); + env.openExternal(Uri.parse(link)); + } + }]; + } } diff --git a/extensions/github/src/shareProviders.ts b/extensions/github/src/shareProviders.ts new file mode 100644 index 00000000000..7aea9c27b24 --- /dev/null +++ b/extensions/github/src/shareProviders.ts @@ -0,0 +1,113 @@ +/*--------------------------------------------------------------------------------------------- + * 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 { API } from './typings/git'; +import { getRepositoryFromUrl, repositoryHasGitHubRemote } from './util'; +import { encodeURIComponentExceptSlashes, ensurePublished, getRepositoryForFile, notebookCellRangeString, rangeString } from './links'; + +export class VscodeDevShareProvider implements vscode.ShareProvider, vscode.Disposable { + readonly id: string = 'copyVscodeDevLink'; + readonly label: string = vscode.l10n.t('Copy vscode.dev Link'); + readonly priority: number = 10; + + + private _hasGitHubRepositories: boolean = false; + private set hasGitHubRepositories(value: boolean) { + vscode.commands.executeCommand('setContext', 'github.hasGitHubRepo', value); + this._hasGitHubRepositories = value; + this.ensureShareProviderRegistration(); + } + + private shareProviderRegistration: vscode.Disposable | undefined; + private disposables: vscode.Disposable[] = []; + + constructor(private readonly gitAPI: API) { + this.initializeGitHubRepoContext(); + } + + dispose() { + this.disposables.forEach(d => d.dispose()); + } + + private initializeGitHubRepoContext() { + if (this.gitAPI.repositories.find(repo => repositoryHasGitHubRemote(repo))) { + this.hasGitHubRepositories = true; + vscode.commands.executeCommand('setContext', 'github.hasGitHubRepo', true); + } else { + this.disposables.push(this.gitAPI.onDidOpenRepository(async e => { + await e.status(); + if (repositoryHasGitHubRemote(e)) { + vscode.commands.executeCommand('setContext', 'github.hasGitHubRepo', true); + this.hasGitHubRepositories = true; + } + })); + } + this.disposables.push(this.gitAPI.onDidCloseRepository(() => { + if (!this.gitAPI.repositories.find(repo => repositoryHasGitHubRemote(repo))) { + this.hasGitHubRepositories = false; + } + })); + } + + private ensureShareProviderRegistration() { + if (vscode.env.appHost !== 'codespaces' && !this.shareProviderRegistration && this._hasGitHubRepositories) { + const shareProviderRegistration = vscode.window.registerShareProvider({ scheme: 'file' }, this); + this.shareProviderRegistration = shareProviderRegistration; + this.disposables.push(shareProviderRegistration); + } else if (this.shareProviderRegistration && !this._hasGitHubRepositories) { + this.shareProviderRegistration.dispose(); + this.shareProviderRegistration = undefined; + } + } + + async provideShare(item: vscode.ShareableItem, _token: vscode.CancellationToken): Promise { + const repository = getRepositoryForFile(this.gitAPI, item.resourceUri); + if (!repository) { + return; + } + + await ensurePublished(repository, item.resourceUri); + + let repo: { owner: string; repo: string } | undefined; + repository.state.remotes.find(remote => { + if (remote.fetchUrl) { + const foundRepo = getRepositoryFromUrl(remote.fetchUrl); + if (foundRepo && (remote.name === repository.state.HEAD?.upstream?.remote)) { + repo = foundRepo; + return; + } else if (foundRepo && !repo) { + repo = foundRepo; + } + } + return; + }); + + if (!repo) { + return; + } + + const blobSegment = repository?.state.HEAD?.name ? encodeURIComponentExceptSlashes(repository.state.HEAD?.name) : repository?.state.HEAD?.commit; + const filepathSegment = encodeURIComponentExceptSlashes(item.resourceUri.path.substring(repository?.rootUri.path.length)); + const rangeSegment = getRangeSegment(item); + return vscode.Uri.parse(`${this.getVscodeDevHost()}/${repo.owner}/${repo.repo}/blob/${blobSegment}${filepathSegment}${rangeSegment}`); + + } + + private getVscodeDevHost(): string { + return `https://${vscode.env.appName.toLowerCase().includes('insiders') ? 'insiders.' : ''}vscode.dev/github`; + } +} + +function getRangeSegment(item: vscode.ShareableItem) { + if (item.resourceUri.scheme === 'vscode-notebook-cell') { + const notebookEditor = vscode.window.visibleNotebookEditors.find(editor => editor.notebook.uri.fsPath === item.resourceUri.fsPath); + const cell = notebookEditor?.notebook.getCells().find(cell => cell.document.uri.fragment === item.resourceUri?.fragment); + const cellIndex = cell?.index ?? notebookEditor?.selection.start; + return notebookCellRangeString(cellIndex, item.selection); + } + + return rangeString(item.selection); +} diff --git a/extensions/github/src/typings/git-base.d.ts b/extensions/github/src/typings/git-base.d.ts index 8510df6d043..53cac4d5c70 100644 --- a/extensions/github/src/typings/git-base.d.ts +++ b/extensions/github/src/typings/git-base.d.ts @@ -44,6 +44,15 @@ export interface PickRemoteSourceResult { readonly branch?: string; } +export interface RemoteSourceAction { + readonly label: string; + /** + * Codicon name + */ + readonly icon: string; + run(branch: string): void; +} + export interface RemoteSource { readonly name: string; readonly description?: string; @@ -70,6 +79,7 @@ export interface RemoteSourceProvider { readonly supportsQuery?: boolean; getBranches?(url: string): ProviderResult; + getRemoteSourceActions?(url: string): ProviderResult; getRecentRemoteSources?(query?: string): ProviderResult; getRemoteSources(query?: string): ProviderResult; } diff --git a/extensions/github/src/typings/git.d.ts b/extensions/github/src/typings/git.d.ts index 83b00f324c0..7ac67937a47 100644 --- a/extensions/github/src/typings/git.d.ts +++ b/extensions/github/src/typings/git.d.ts @@ -78,6 +78,8 @@ export const enum Status { UNTRACKED, IGNORED, INTENT_TO_ADD, + INTENT_TO_RENAME, + TYPE_CHANGED, ADDED_BY_US, ADDED_BY_THEM, @@ -156,6 +158,10 @@ export interface FetchOptions { depth?: number; } +export interface InitOptions { + defaultBranch?: string; +} + export interface BranchQuery { readonly remote?: boolean; readonly pattern?: string; @@ -301,7 +307,7 @@ export interface API { toGitUri(uri: Uri, ref: string): Uri; getRepository(uri: Uri): Repository | null; - init(root: Uri): Promise; + init(root: Uri, options?: InitOptions): Promise; openRepository(root: Uri): Promise registerRemoteSourcePublisher(publisher: RemoteSourcePublisher): Disposable; diff --git a/extensions/github/src/typings/vscode.proposed.canonicalUriIdentityProvider.d.ts b/extensions/github/src/typings/vscode.proposed.canonicalUriIdentityProvider.d.ts deleted file mode 100644 index 3a61ca15798..00000000000 --- a/extensions/github/src/typings/vscode.proposed.canonicalUriIdentityProvider.d.ts +++ /dev/null @@ -1,38 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -declare module 'vscode' { - - // https://github.com/microsoft/vscode/issues/180582 - - export namespace workspace { - /** - * - * @param scheme The URI scheme that this provider can provide canonical URI identities for. - * A canonical URI represents the conversion of a resource's alias into a source of truth URI. - * Multiple aliases may convert to the same source of truth URI. - * @param provider A provider which can convert URIs for workspace folders of scheme @param scheme to - * a canonical URI identifier which is stable across machines. - */ - export function registerCanonicalUriIdentityProvider(scheme: string, provider: CanonicalUriIdentityProvider): Disposable; - - /** - * - * @param uri The URI to provide a canonical URI identity for. - * @param token A cancellation token for the request. - */ - export function provideCanonicalUriIdentity(uri: Uri, token: CancellationToken): ProviderResult; - } - - export interface CanonicalUriIdentityProvider { - /** - * - * @param uri The URI to provide a canonical URI identity for. - * @param token A cancellation token for the request. - * @returns The canonical URI identity for the requested URI. - */ - provideCanonicalUriIdentity(uri: Uri, token: CancellationToken): ProviderResult; - } -} diff --git a/extensions/github/src/typings/vscode.proposed.canonicalUriProvider.d.ts b/extensions/github/src/typings/vscode.proposed.canonicalUriProvider.d.ts new file mode 100644 index 00000000000..84ee599797d --- /dev/null +++ b/extensions/github/src/typings/vscode.proposed.canonicalUriProvider.d.ts @@ -0,0 +1,47 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +declare module 'vscode' { + + // https://github.com/microsoft/vscode/issues/180582 + + export namespace workspace { + /** + * + * @param scheme The URI scheme that this provider can provide canonical URIs for. + * A canonical URI represents the conversion of a resource's alias into a source of truth URI. + * Multiple aliases may convert to the same source of truth URI. + * @param provider A provider which can convert URIs of scheme @param scheme to + * a canonical URI which is stable across machines. + */ + export function registerCanonicalUriProvider(scheme: string, provider: CanonicalUriProvider): Disposable; + + /** + * + * @param uri The URI to provide a canonical URI for. + * @param token A cancellation token for the request. + */ + export function getCanonicalUri(uri: Uri, options: CanonicalUriRequestOptions, token: CancellationToken): ProviderResult; + } + + export interface CanonicalUriProvider { + /** + * + * @param uri The URI to provide a canonical URI for. + * @param options Options that the provider should honor in the URI it returns. + * @param token A cancellation token for the request. + * @returns The canonical URI for the requested URI or undefined if no canonical URI can be provided. + */ + provideCanonicalUri(uri: Uri, options: CanonicalUriRequestOptions, token: CancellationToken): ProviderResult; + } + + export interface CanonicalUriRequestOptions { + /** + * + * The desired scheme of the canonical URI. + */ + targetScheme: string; + } +} diff --git a/extensions/github/src/typings/vscode.proposed.shareProvider.d.ts b/extensions/github/src/typings/vscode.proposed.shareProvider.d.ts new file mode 100644 index 00000000000..6470557cac1 --- /dev/null +++ b/extensions/github/src/typings/vscode.proposed.shareProvider.d.ts @@ -0,0 +1,29 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +// https://github.com/microsoft/vscode/issues/176316 + +declare module 'vscode' { + export interface TreeItem { + shareableItem?: ShareableItem; + } + + export interface ShareableItem { + resourceUri: Uri; + selection?: Range; + } + + export interface ShareProvider { + readonly id: string; + readonly label: string; + readonly priority: number; + + provideShare(item: ShareableItem, token: CancellationToken): ProviderResult; + } + + export namespace window { + export function registerShareProvider(selector: DocumentSelector, provider: ShareProvider): Disposable; + } +} diff --git a/extensions/github/yarn.lock b/extensions/github/yarn.lock index 6d2eafc2bf5..323df7dadbe 100644 --- a/extensions/github/yarn.lock +++ b/extensions/github/yarn.lock @@ -2,6 +2,129 @@ # yarn lockfile v1 +"@azure/abort-controller@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.1.0.tgz#788ee78457a55af8a1ad342acb182383d2119249" + integrity sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw== + dependencies: + tslib "^2.2.0" + +"@azure/core-auth@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.4.0.tgz#6fa9661c1705857820dbc216df5ba5665ac36a9e" + integrity sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ== + dependencies: + "@azure/abort-controller" "^1.0.0" + tslib "^2.2.0" + +"@azure/core-rest-pipeline@^1.10.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.11.0.tgz#fc0e8f56caac08a9d4ac91c07a6c5a360ea31c82" + integrity sha512-nB4KXl6qAyJmBVLWA7SakT4tzpYZTCk4pvRBeI+Ye0WYSOrlTqlMhc4MSS/8atD3ufeYWdkN380LLoXlUUzThw== + dependencies: + "@azure/abort-controller" "^1.0.0" + "@azure/core-auth" "^1.4.0" + "@azure/core-tracing" "^1.0.1" + "@azure/core-util" "^1.3.0" + "@azure/logger" "^1.0.0" + form-data "^4.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + tslib "^2.2.0" + +"@azure/core-tracing@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.1.tgz#352a38cbea438c4a83c86b314f48017d70ba9503" + integrity sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw== + dependencies: + tslib "^2.2.0" + +"@azure/core-util@^1.3.0": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.3.2.tgz#3f8cfda1e87fac0ce84f8c1a42fcd6d2a986632d" + integrity sha512-2bECOUh88RvL1pMZTcc6OzfobBeWDBf5oBbhjIhT1MV9otMVWCzpOJkkiKtrnO88y5GGBelgY8At73KGAdbkeQ== + dependencies: + "@azure/abort-controller" "^1.0.0" + tslib "^2.2.0" + +"@azure/logger@^1.0.0": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.4.tgz#28bc6d0e5b3c38ef29296b32d35da4e483593fa1" + integrity sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg== + dependencies: + tslib "^2.2.0" + +"@microsoft/1ds-core-js@3.2.12", "@microsoft/1ds-core-js@^3.2.8": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.12.tgz#f5f56626bd0385a357fae6f730eea347be02ce64" + integrity sha512-cHpxZZ+pbtOyqFMFB/c1COpaOE3VPFU6phYVHVvOA9DvoeMZfI/Xrxaj7B/vfq4MmkiE7nOAPhv5ZRn+i6OogA== + dependencies: + "@microsoft/applicationinsights-core-js" "2.8.14" + "@microsoft/applicationinsights-shims" "^2.0.2" + "@microsoft/dynamicproto-js" "^1.1.7" + +"@microsoft/1ds-post-js@^3.2.8": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.12.tgz#60f6ff48ba48c88880c1bceb376711cdd34f87ea" + integrity sha512-vhIVYg4FzBfwtM8tBqDUq3xU+cFu6SQ7biuJHtQpd5PVjDgvAovVOMRF1khsZE/k2rttRRBpmBgNEqG3Ptoysw== + dependencies: + "@microsoft/1ds-core-js" "3.2.12" + "@microsoft/applicationinsights-shims" "^2.0.2" + "@microsoft/dynamicproto-js" "^1.1.7" + +"@microsoft/applicationinsights-channel-js@2.8.14": + version "2.8.14" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-2.8.14.tgz#daabd8a418d9b70a318c0126518e000dd6f67fa0" + integrity sha512-z1AG6lqV3ACtdUXnT0Ubj48BAZ8K01sFsYdWgroSXpw2lYUlXAzdx3tK8zpaqEXSEhok8CWTZki7aunHzkZHSw== + dependencies: + "@microsoft/applicationinsights-common" "2.8.14" + "@microsoft/applicationinsights-core-js" "2.8.14" + "@microsoft/applicationinsights-shims" "2.0.2" + "@microsoft/dynamicproto-js" "^1.1.9" + +"@microsoft/applicationinsights-common@2.8.14": + version "2.8.14" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-2.8.14.tgz#7d082295f862a189c80aa98b3f4aaec926546051" + integrity sha512-1xjJvyyRN7tb5ahOTkEGGsvw8zvqmS714y3+1m7ooKHFfxO0wX+eYOU/kke74BCY0nJ/pocB/6hjWZOgwvbHig== + dependencies: + "@microsoft/applicationinsights-core-js" "2.8.14" + "@microsoft/applicationinsights-shims" "2.0.2" + "@microsoft/dynamicproto-js" "^1.1.9" + +"@microsoft/applicationinsights-core-js@2.8.14": + version "2.8.14" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.14.tgz#80e3d9d42102e741494726d78ac923098bad7132" + integrity sha512-XacWUHdjSHMUwdngMZBp0oiCBifD56CQK2Egu2PiBiF4xu2AO2yNCtWSXsQX2g5OkEhVwaEjfa/aH3WbpYxB1g== + dependencies: + "@microsoft/applicationinsights-shims" "2.0.2" + "@microsoft/dynamicproto-js" "^1.1.9" + +"@microsoft/applicationinsights-shims@2.0.2", "@microsoft/applicationinsights-shims@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz#92b36a09375e2d9cb2b4203383b05772be837085" + integrity sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg== + +"@microsoft/applicationinsights-web-basic@^2.8.9": + version "2.8.14" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-2.8.14.tgz#8c43bcad2e12f25eb00a9aaad0182371507b21b9" + integrity sha512-R2mzg5NmCtLloq3lPQFmnlvjrPIqm3mWNYVy5ELJuOPZ7S6j9y7s4yHOzfXynmOziiQd+0q1j9pTth9aP9vo0g== + dependencies: + "@microsoft/applicationinsights-channel-js" "2.8.14" + "@microsoft/applicationinsights-common" "2.8.14" + "@microsoft/applicationinsights-core-js" "2.8.14" + "@microsoft/applicationinsights-shims" "2.0.2" + "@microsoft/dynamicproto-js" "^1.1.9" + +"@microsoft/applicationinsights-web-snippet@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.0.1.tgz#6bb788b2902e48bf5d460c38c6bb7fedd686ddd7" + integrity sha512-2IHAOaLauc8qaAitvWS+U931T+ze+7MNWrDHY47IENP5y2UA0vqJDu67kWZDdpCN1fFC77sfgfB+HV7SrKshnQ== + +"@microsoft/dynamicproto-js@^1.1.7", "@microsoft/dynamicproto-js@^1.1.9": + version "1.1.9" + resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz#7437db7aa061162ee94e4131b69a62b8dad5dea6" + integrity sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ== + "@octokit/auth-token@^3.0.0": version "3.0.1" resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.1.tgz#88bc2baf5d706cb258474e722a720a8365dff2ec" @@ -132,21 +255,178 @@ dependencies: "@octokit/openapi-types" "^17.1.0" +"@opentelemetry/api@^1.0.4": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.4.1.tgz#ff22eb2e5d476fbc2450a196e40dd243cc20c28f" + integrity sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA== + +"@opentelemetry/core@1.14.0", "@opentelemetry/core@^1.0.1": + version "1.14.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.14.0.tgz#64e876b29cb736c984d54164cd47433f513eafd3" + integrity sha512-MnMZ+sxsnlzloeuXL2nm5QcNczt/iO82UOeQQDHhV83F2fP3sgntW2evvtoxJki0MBLxEsh5ADD7PR/Hn5uzjw== + dependencies: + "@opentelemetry/semantic-conventions" "1.14.0" + +"@opentelemetry/resources@1.14.0": + version "1.14.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.14.0.tgz#d6b0a4e71c2706d33c8c6ec7a7b8fea6ad27ddea" + integrity sha512-qRfWIgBxxl3z47E036Aey0Lj2ZjlFb27Q7Xnj1y1z/P293RXJZGLtcfn/w8JF7v1Q2hs3SDGxz7Wb9Dko1YUQA== + dependencies: + "@opentelemetry/core" "1.14.0" + "@opentelemetry/semantic-conventions" "1.14.0" + +"@opentelemetry/sdk-trace-base@^1.0.1": + version "1.14.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.14.0.tgz#831af08f002228a11e577ff860eb6059c8b80fb7" + integrity sha512-NzRGt3PS+HPKfQYMb6Iy8YYc5OKA73qDwci/6ujOIvyW9vcqBJSWbjZ8FeLEAmuatUB5WrRhEKu9b0sIiIYTrQ== + dependencies: + "@opentelemetry/core" "1.14.0" + "@opentelemetry/resources" "1.14.0" + "@opentelemetry/semantic-conventions" "1.14.0" + +"@opentelemetry/semantic-conventions@1.14.0", "@opentelemetry/semantic-conventions@^1.0.1": + version "1.14.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.14.0.tgz#6a729b7f372ce30f77a3f217c09bc216f863fccb" + integrity sha512-rJfCY8rCWz3cb4KI6pEofnytvMPuj3YLQwoscCCYZ5DkdiPjo15IQ0US7+mjcWy9H3fcZIzf2pbJZ7ck/h4tug== + +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== + "@types/node@16.x": version "16.11.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== +"@vscode/extension-telemetry@0.7.5": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.7.5.tgz#bf965731816e08c3f146f96d901ec67954fc913b" + integrity sha512-fJ5y3TcpqqkFYHneabYaoB4XAhDdVflVm+TDKshw9VOs77jkgNS4UA7LNXrWeO0eDne3Sh3JgURf+xzc1rk69w== + dependencies: + "@microsoft/1ds-core-js" "^3.2.8" + "@microsoft/1ds-post-js" "^3.2.8" + "@microsoft/applicationinsights-web-basic" "^2.8.9" + applicationinsights "2.4.1" + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +applicationinsights@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-2.4.1.tgz#4de4c4dd3c7c4a44445cfbf3d15808fc0dcc423d" + integrity sha512-0n0Ikd0gzSm460xm+M0UTWIwXrhrH/0bqfZatcJjYObWyefxfAxapGEyNnSGd1Tg90neHz+Yhf+Ff/zgvPiQYA== + dependencies: + "@azure/core-auth" "^1.4.0" + "@azure/core-rest-pipeline" "^1.10.0" + "@microsoft/applicationinsights-web-snippet" "^1.0.1" + "@opentelemetry/api" "^1.0.4" + "@opentelemetry/core" "^1.0.1" + "@opentelemetry/sdk-trace-base" "^1.0.1" + "@opentelemetry/semantic-conventions" "^1.0.1" + cls-hooked "^4.2.2" + continuation-local-storage "^3.2.1" + diagnostic-channel "1.1.0" + diagnostic-channel-publishers "1.0.5" + +async-hook-jl@^1.7.6: + version "1.7.6" + resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68" + integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg== + dependencies: + stack-chain "^1.3.7" + +async-listener@^0.6.0: + version "0.6.10" + resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc" + integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw== + dependencies: + semver "^5.3.0" + shimmer "^1.1.0" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + before-after-hook@^2.2.0: version "2.2.2" resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e" integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ== +cls-hooked@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908" + integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw== + dependencies: + async-hook-jl "^1.7.6" + emitter-listener "^1.0.1" + semver "^5.4.1" + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +continuation-local-storage@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb" + integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA== + dependencies: + async-listener "^0.6.0" + emitter-listener "^1.1.1" + +debug@4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + deprecation@^2.0.0, deprecation@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== +diagnostic-channel-publishers@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.5.tgz#df8c317086c50f5727fdfb5d2fce214d2e4130ae" + integrity sha512-dJwUS0915pkjjimPJVDnS/QQHsH0aOYhnZsLJdnZIMOrB+csj8RnZhWTuwnm8R5v3Z7OZs+ksv5luC14DGB7eg== + +diagnostic-channel@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-1.1.0.tgz#6985e9dfedfbc072d91dc4388477e4087147756e" + integrity sha512-fwujyMe1gj6rk6dYi9hMZm0c8Mz8NDMVl2LB4iaYh3+LIAThZC8RKFGXWG0IML2OxAit/ZFRgZhMkhQ3d/bobQ== + dependencies: + semver "^5.3.0" + +emitter-listener@^1.0.1, emitter-listener@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8" + integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ== + dependencies: + shimmer "^1.2.0" + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + graphql-tag@^2.10.3: version "2.12.6" resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1" @@ -159,11 +439,45 @@ graphql@^16.0.0: resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb" integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw== +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + +https-proxy-agent@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + is-plain-object@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + node-fetch@^2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" @@ -178,6 +492,21 @@ once@^1.4.0: dependencies: wrappy "1" +semver@^5.3.0, semver@^5.4.1: + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== + +shimmer@^1.1.0, shimmer@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" + integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== + +stack-chain@^1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285" + integrity sha512-D8cWtWVdIe/jBA7v5p5Hwl5yOSOrmZPWDPe2KxQ5UAGD+nxbxU0lKXA4h85Ta6+qgdKVL3vUxsbIZjc1kBG7ug== + tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" @@ -188,6 +517,11 @@ tslib@^2.1.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== +tslib@^2.2.0: + version "2.5.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913" + integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w== + tunnel@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json index 40fdf48929e..972caba7fb3 100644 --- a/extensions/html-language-features/package.json +++ b/extensions/html-language-features/package.json @@ -259,7 +259,7 @@ }, "dependencies": { "@vscode/extension-telemetry": "^0.7.5", - "vscode-languageclient": "^8.2.0-next.0", + "vscode-languageclient": "^8.2.0-next.1", "vscode-uri": "^3.0.7" }, "devDependencies": { diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json index 90af54bc21c..5c3e9e11623 100644 --- a/extensions/html-language-features/server/package.json +++ b/extensions/html-language-features/server/package.json @@ -9,10 +9,10 @@ }, "main": "./out/node/htmlServerMain", "dependencies": { - "@vscode/l10n": "^0.0.13", - "vscode-css-languageservice": "^6.2.5", - "vscode-html-languageservice": "^5.0.5", - "vscode-languageserver": "^8.2.0-next.0", + "@vscode/l10n": "^0.0.14", + "vscode-css-languageservice": "^6.2.6", + "vscode-html-languageservice": "^5.0.6", + "vscode-languageserver": "^8.2.0-next.1", "vscode-languageserver-textdocument": "^1.0.8", "vscode-uri": "^3.0.7" }, diff --git a/extensions/html-language-features/server/src/test/folding.test.ts b/extensions/html-language-features/server/src/test/folding.test.ts index 44aaea9026c..ec33f7a5198 100644 --- a/extensions/html-language-features/server/src/test/folding.test.ts +++ b/extensions/html-language-features/server/src/test/folding.test.ts @@ -37,7 +37,7 @@ function r(startLine: number, endLine: number, kind?: string): ExpectedIndentRan return { startLine, endLine, kind }; } -suite('HTML Folding', async () => { +suite('HTML Folding', () => { test('Embedded JavaScript', async () => { const input = [ diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock index 88d6991226a..8bed471b29c 100644 --- a/extensions/html-language-features/server/yarn.lock +++ b/extensions/html-language-features/server/yarn.lock @@ -12,27 +12,27 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -"@vscode/l10n@^0.0.13": - version "0.0.13" - resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.13.tgz#f51ff130b8c98f189476c5f812d214b8efb09590" - integrity sha512-A3uY356uOU9nGa+TQIT/i3ziWUgJjVMUrGGXSrtRiTwklyCFjGVWIOHoEIHbJpiyhDkJd9kvIWUOfXK1IkK8XQ== +"@vscode/l10n@^0.0.14": + version "0.0.14" + resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.14.tgz#431e5814c35c3cb11ee21873bc70a4b0fbf90fcf" + integrity sha512-/yrv59IEnmh655z1oeDnGcvMYwnEzNzHLgeYcQCkhYX0xBvYWrAuefoiLcPBUkMpJsb46bqQ6Yv4pwTTQ4d3Qg== -vscode-css-languageservice@^6.2.5: - version "6.2.5" - resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.5.tgz#bcea53dac7b61c1ff483668a7403042779ab27b0" - integrity sha512-/1oyBZK3jfx6A0cA46FCUpy6OlqEsMT47LUIldCIP1YMKRYezJ9No+aNj9IM0AqhRZ92DxZ1DmU5lJ+biuiacA== +vscode-css-languageservice@^6.2.6: + version "6.2.6" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.6.tgz#bc26c2abaaa2eb117b143fdb9387ee1701d9661a" + integrity sha512-SA2WkeOecIpUiEbZnjOsP/fI5CRITZEiQGSHXKiDQDwLApfKcnLhZwMtOBbIifSzESVcQa7b/shX/nbnF4NoCg== dependencies: - "@vscode/l10n" "^0.0.13" + "@vscode/l10n" "^0.0.14" vscode-languageserver-textdocument "^1.0.8" vscode-languageserver-types "^3.17.3" vscode-uri "^3.0.7" -vscode-html-languageservice@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.0.5.tgz#3c7c7fdcea8f93914dfd8762a40dbfbe770e2243" - integrity sha512-7788ZT+I7/UhFoI4+bzaAiGGZEW7X39kTeuytLtw6jJA6W7ez85bWKYoFDcwrPNmywj3n/IkU9Op9asaje44jg== +vscode-html-languageservice@^5.0.6: + version "5.0.6" + resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.0.6.tgz#e7a7f78e9f98d0f5341c5518dd9305e3cc438bb6" + integrity sha512-gCixNg6fjPO7+kwSMBAVXcwDRHdjz1WOyNfI0n5Wx0J7dfHG8ggb3zD1FI8E2daTZrwS1cooOiSoc1Xxph4qRQ== dependencies: - "@vscode/l10n" "^0.0.13" + "@vscode/l10n" "^0.0.14" vscode-languageserver-textdocument "^1.0.8" vscode-languageserver-types "^3.17.3" vscode-uri "^3.0.7" @@ -42,10 +42,10 @@ vscode-jsonrpc@8.2.0-next.0: resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageserver-protocol@3.17.4-next.0: - version "3.17.4-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" - integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== +vscode-languageserver-protocol@3.17.4-next.1: + version "3.17.4-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.1.tgz#a15480e1bc663853ae90ded226efafc5ab333616" + integrity sha512-qrK4BycgPR/+nkRN9PRVTblkLp+kUPUmAgF6rDhFzZIPXW4/MqWwFUT8uswIMGdlTPPgCEkFO/AYEZK1fDXODg== dependencies: vscode-jsonrpc "8.2.0-next.0" vscode-languageserver-types "3.17.4-next.0" @@ -65,12 +65,12 @@ vscode-languageserver-types@^3.17.3: resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64" integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA== -vscode-languageserver@^8.2.0-next.0: - version "8.2.0-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.2.0-next.0.tgz#ad9bcef650e0bae9d32591ebbda3eb5e548418a7" - integrity sha512-Pw1pdR+hZvaeeVvbmEscUJG0SMMa5//iV+OnFuv4cPPvk+ohe4mtrVAcI06Z9HIMxDu+2McqY1b8JbVvyRKFtg== +vscode-languageserver@^8.2.0-next.1: + version "8.2.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.2.0-next.1.tgz#ad2558d74392b1cfaccd427febe9a368fc328f8b" + integrity sha512-994AXMKBijzjlnpf8p9M+ntsNJDjR8pr55NJPYxKjy/nUhVkg962dAomelH6Z94401kBZmSbfP/K/20cB54aFA== dependencies: - vscode-languageserver-protocol "3.17.4-next.0" + vscode-languageserver-protocol "3.17.4-next.1" vscode-uri@^3.0.7: version "3.0.7" diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock index 19aecf25060..c6dda3cbc53 100644 --- a/extensions/html-language-features/yarn.lock +++ b/extensions/html-language-features/yarn.lock @@ -349,14 +349,14 @@ ms@2.1.2: integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== semver@^5.3.0, semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" @@ -385,19 +385,19 @@ vscode-jsonrpc@8.2.0-next.0: resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageclient@^8.2.0-next.0: - version "8.2.0-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.2.0-next.0.tgz#7415c831c4c1e38cc08e710e744c36c5d2251bd8" - integrity sha512-Gqr47Up5VDuRT8JrfB0QFGXR9ngQDkfIJfbT0xmM4OIsISqH3uUgXHTAhekRtS4N6aER3UvGXUrrRWQUaBGYHA== +vscode-languageclient@^8.2.0-next.1: + version "8.2.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.2.0-next.1.tgz#a3f98b80cfa3225fde0583aa6a5c9b20219fa37e" + integrity sha512-oITaqHQ10PM3zXCUu/104wriMeDutXMkQXMaRBWh1jKihcNcUBLC/os7RhqiVGypY0nl+F0pwStAf4Koc8inaw== dependencies: minimatch "^5.1.0" semver "^7.3.7" - vscode-languageserver-protocol "3.17.4-next.0" + vscode-languageserver-protocol "3.17.4-next.1" -vscode-languageserver-protocol@3.17.4-next.0: - version "3.17.4-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" - integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== +vscode-languageserver-protocol@3.17.4-next.1: + version "3.17.4-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.1.tgz#a15480e1bc663853ae90ded226efafc5ab333616" + integrity sha512-qrK4BycgPR/+nkRN9PRVTblkLp+kUPUmAgF6rDhFzZIPXW4/MqWwFUT8uswIMGdlTPPgCEkFO/AYEZK1fDXODg== dependencies: vscode-jsonrpc "8.2.0-next.0" vscode-languageserver-types "3.17.4-next.0" diff --git a/extensions/ipynb/esbuild.js b/extensions/ipynb/esbuild.js index 28000f1ebf9..64b58109fec 100644 --- a/extensions/ipynb/esbuild.js +++ b/extensions/ipynb/esbuild.js @@ -5,47 +5,14 @@ //@ts-check const path = require('path'); -const fse = require('fs-extra'); -const esbuild = require('esbuild'); - -const args = process.argv.slice(2); - -const isWatch = args.indexOf('--watch') >= 0; - -let outputRoot = __dirname; -const outputRootIndex = args.indexOf('--outputRoot'); -if (outputRootIndex >= 0) { - outputRoot = args[outputRootIndex + 1]; -} const srcDir = path.join(__dirname, 'notebook-src'); -const outDir = path.join(outputRoot, 'notebook-out'); +const outDir = path.join(__dirname, 'notebook-out'); -async function build() { - await esbuild.build({ - entryPoints: [ - path.join(srcDir, 'cellAttachmentRenderer.ts'), - ], - bundle: true, - minify: false, - sourcemap: false, - format: 'esm', - outdir: outDir, - platform: 'browser', - target: ['es2020'], - }); -} - - -build().catch(() => process.exit(1)); - -if (isWatch) { - const watcher = require('@parcel/watcher'); - watcher.subscribe(srcDir, async () => { - try { - await build(); - } catch (e) { - console.error(e); - } - }); -} +require('../esbuild-webview-common').run({ + entryPoints: [ + path.join(srcDir, 'cellAttachmentRenderer.ts'), + ], + srcDir, + outdir: outDir, +}, process.argv); diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json index 153e8a9e34e..ce667a5d277 100644 --- a/extensions/ipynb/package.json +++ b/extensions/ipynb/package.json @@ -14,7 +14,8 @@ "dropMetadata" ], "activationEvents": [ - "onNotebook:jupyter-notebook" + "onNotebook:jupyter-notebook", + "onNotebookSerializer:interactive" ], "extensionKind": [ "workspace", diff --git a/extensions/ipynb/src/ipynbMain.ts b/extensions/ipynb/src/ipynbMain.ts index ca8e2b3ce4a..1d61f8a1cae 100644 --- a/extensions/ipynb/src/ipynbMain.ts +++ b/extensions/ipynb/src/ipynbMain.ts @@ -43,6 +43,18 @@ export function activate(context: vscode.ExtensionContext) { } } as vscode.NotebookDocumentContentOptions)); + context.subscriptions.push(vscode.workspace.registerNotebookSerializer('interactive', serializer, { + transientOutputs: false, + transientCellMetadata: { + breakpointMargin: true, + custom: false, + attachments: false + }, + cellContentMetadata: { + attachments: true + } + } as vscode.NotebookDocumentContentOptions)); + vscode.languages.registerCodeLensProvider({ pattern: '**/*.ipynb' }, { provideCodeLenses: (document) => { if ( diff --git a/extensions/ipynb/src/notebookAttachmentCleaner.ts b/extensions/ipynb/src/notebookAttachmentCleaner.ts index e403fed51cf..cad19f07b29 100644 --- a/extensions/ipynb/src/notebookAttachmentCleaner.ts +++ b/extensions/ipynb/src/notebookAttachmentCleaner.ts @@ -231,9 +231,12 @@ export class AttachmentCleaner implements vscode.CodeActionProvider { if (cell.index > -1 && !objectEquals(markdownAttachmentsInUse, cell.metadata.attachments)) { const updateMetadata: { [key: string]: any } = deepClone(cell.metadata); - updateMetadata.attachments = markdownAttachmentsInUse; + if (Object.keys(markdownAttachmentsInUse).length === 0) { + updateMetadata.attachments = undefined; + } else { + updateMetadata.attachments = markdownAttachmentsInUse; + } const metadataEdit = vscode.NotebookEdit.updateCellMetadata(cell.index, updateMetadata); - return metadataEdit; } return; diff --git a/extensions/java/cgmanifest.json b/extensions/java/cgmanifest.json index a4db862ab7d..be9e7439fe7 100644 --- a/extensions/java/cgmanifest.json +++ b/extensions/java/cgmanifest.json @@ -4,13 +4,47 @@ "component": { "type": "git", "git": { - "name": "atom/language-java", - "repositoryUrl": "https://github.com/atom/language-java", - "commitHash": "29f977dc42a7e2568b39bb6fb34c4ef108eb59b3" + "name": "redhat-developer/vscode-java", + "repositoryUrl": "https://github.com/redhat-developer/vscode-java", + "commitHash": "5fb57e8e1c5d776b21be13cd7227b25b87edf4a6" } }, "license": "MIT", - "version": "0.32.1" + "licenseDetail": [ + "Copyright (c) 2014 GitHub Inc.", + "", + "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.", + "", + "--------------------------------------------------------------------", + "", + "This package was derived from a TextMate bundle located at", + "https://github.com/textmate/java.tmbundle and distributed under the following", + "license, located in `README.mdown`:", + "", + "Permission to copy, use, modify, sell and distribute this", + "software is granted. This software is provided \"as is\" without", + "express or implied warranty, and with no claim as to its", + "suitability for any purpose." + ], + "description": "This grammar was derived from https://github.com/atom/language-java/blob/master/grammars/java.cson.", + "version": "1.21.0" } ], "version": 1 diff --git a/extensions/java/package.json b/extensions/java/package.json index d71aa1c146c..6788ddd2133 100644 --- a/extensions/java/package.json +++ b/extensions/java/package.json @@ -9,7 +9,7 @@ "vscode": "*" }, "scripts": { - "update-grammar": "node ../node_modules/vscode-grammar-updater/bin atom/language-java grammars/java.cson ./syntaxes/java.tmLanguage.json" + "update-grammar": "node ../node_modules/vscode-grammar-updater/bin redhat-developer/vscode-java language-support/java/java.tmLanguage.json ./syntaxes/java.tmLanguage.json" }, "contributes": { "languages": [ diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json index be70cbb27c3..337545b0233 100644 --- a/extensions/java/syntaxes/java.tmLanguage.json +++ b/extensions/java/syntaxes/java.tmLanguage.json @@ -1,10 +1,10 @@ { "information_for_contributors": [ - "This file has been converted from https://github.com/atom/language-java/blob/master/grammars/java.cson", + "This file has been converted from https://github.com/redhat-developer/vscode-java/blob/master/language-support/java/java.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/atom/language-java/commit/29f977dc42a7e2568b39bb6fb34c4ef108eb59b3", + "version": "https://github.com/redhat-developer/vscode-java/commit/5fb57e8e1c5d776b21be13cd7227b25b87edf4a6", "name": "Java", "scopeName": "source.java", "patterns": [ @@ -1378,6 +1378,17 @@ }, "properties": { "patterns": [ + { + "match": "(\\.)\\s*(new)", + "captures": { + "1": { + "name": "punctuation.separator.period.java" + }, + "2": { + "name": "keyword.control.new.java" + } + } + }, { "match": "(\\.)\\s*([a-zA-Z_$][\\w$]*)(?=\\s*\\.\\s*[a-zA-Z_$][\\w$]*)", "captures": { @@ -1571,6 +1582,31 @@ }, "strings": { "patterns": [ + { + "begin": "\"\"\"", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.java" + } + }, + "end": "\"\"\"", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.java" + } + }, + "name": "string.quoted.triple.java", + "patterns": [ + { + "match": "\\\\\"\"\"", + "name": "constant.character.escape.java" + }, + { + "match": "\\\\.", + "name": "constant.character.escape.java" + } + ] + }, { "begin": "\"", "beginCaptures": { @@ -1632,6 +1668,9 @@ { "match": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*", "name": "storage.type.java" + }, + { + "include": "#comments" } ] }, diff --git a/extensions/javascript/javascript-language-configuration.json b/extensions/javascript/javascript-language-configuration.json index abfef6e8c4c..4029985233a 100644 --- a/extensions/javascript/javascript-language-configuration.json +++ b/extensions/javascript/javascript-language-configuration.json @@ -188,6 +188,15 @@ "action": { "indent": "indent" } + }, + { + // Decrease indentation after single line if/else if/else, for, or while + "previousLineText": "^\\s*(((else ?)?if|for|while)\\s*\\(.*\\)\\s*|else\\s*)$", + // But make sure line doesn't have braces or is not another if statement + "beforeText": "^\\s+([^{i\\s]|i(?!f\\b))", + "action": { + "indent": "outdent" + } } ] } diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json index 9726c5ab25a..4fe09e087aa 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/e0aefd8205cc9d1bc7859cc5babbee0d833dca0f", + "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/8c7482b94b548eab56da64dbfb30b82589b3f747", "name": "JavaScript (with React support)", "scopeName": "source.js", "patterns": [ @@ -134,7 +134,7 @@ "name": "keyword.control.flow.js" } }, - "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#expression" @@ -299,7 +299,7 @@ { "name": "meta.var.expr.js", "begin": "(?=(?|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "patterns": [ { "include": "#comment" @@ -1808,7 +1876,7 @@ }, { "begin": "(?<=:)\\s*", - "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#expression" @@ -1969,7 +2037,7 @@ "name": "storage.type.namespace.js" } }, - "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#comment" @@ -2006,7 +2074,7 @@ "name": "entity.name.type.alias.js" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#comment" @@ -2024,7 +2092,7 @@ "name": "keyword.control.intrinsic.js" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type" @@ -2038,7 +2106,7 @@ "name": "keyword.operator.assignment.js" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type" @@ -2229,7 +2297,7 @@ "name": "keyword.control.default.js" } }, - "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#interface-declaration" @@ -2241,7 +2309,7 @@ }, { "name": "meta.export.js", - "begin": "(?:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=[,);}\\]=>:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type-arguments" @@ -3904,7 +3972,7 @@ "name": "keyword.operator.type.annotation.js" } }, - "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "patterns": [ { "include": "#arrow-return-type-body" @@ -3918,7 +3986,7 @@ "name": "meta.arrow.js meta.return.type.arrow.js keyword.operator.type.annotation.js" } }, - "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "contentName": "meta.arrow.js meta.return.type.arrow.js", "patterns": [ { diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json index b0fb54f1707..b9869694bdd 100644 --- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json +++ b/extensions/javascript/syntaxes/JavaScriptReact.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/e0aefd8205cc9d1bc7859cc5babbee0d833dca0f", + "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/8c7482b94b548eab56da64dbfb30b82589b3f747", "name": "JavaScript (with React support)", "scopeName": "source.js.jsx", "patterns": [ @@ -134,7 +134,7 @@ "name": "keyword.control.flow.js.jsx" } }, - "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#expression" @@ -299,7 +299,7 @@ { "name": "meta.var.expr.js.jsx", "begin": "(?=(?|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "patterns": [ { "include": "#comment" @@ -1808,7 +1876,7 @@ }, { "begin": "(?<=:)\\s*", - "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#expression" @@ -1969,7 +2037,7 @@ "name": "storage.type.namespace.js.jsx" } }, - "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#comment" @@ -2006,7 +2074,7 @@ "name": "entity.name.type.alias.js.jsx" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#comment" @@ -2024,7 +2092,7 @@ "name": "keyword.control.intrinsic.js.jsx" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type" @@ -2038,7 +2106,7 @@ "name": "keyword.operator.assignment.js.jsx" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type" @@ -2229,7 +2297,7 @@ "name": "keyword.control.default.js.jsx" } }, - "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#interface-declaration" @@ -2241,7 +2309,7 @@ }, { "name": "meta.export.js.jsx", - "begin": "(?:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=[,);}\\]=>:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type-arguments" @@ -3904,7 +3972,7 @@ "name": "keyword.operator.type.annotation.js.jsx" } }, - "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "patterns": [ { "include": "#arrow-return-type-body" @@ -3918,7 +3986,7 @@ "name": "meta.arrow.js.jsx meta.return.type.arrow.js.jsx keyword.operator.type.annotation.js.jsx" } }, - "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "contentName": "meta.arrow.js.jsx meta.return.type.arrow.js.jsx", "patterns": [ { diff --git a/extensions/json-language-features/client/src/jsonClient.ts b/extensions/json-language-features/client/src/jsonClient.ts index d6e1404a7ac..23410ebb814 100644 --- a/extensions/json-language-features/client/src/jsonClient.ts +++ b/extensions/json-language-features/client/src/jsonClient.ts @@ -8,7 +8,7 @@ export type JSONLanguageStatus = { schemas: string[] }; import { workspace, window, languages, commands, ExtensionContext, extensions, Uri, ColorInformation, Diagnostic, StatusBarAlignment, TextEditor, TextDocument, FormattingOptions, CancellationToken, FoldingRange, - ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n + ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n, TextEditorOptions } from 'vscode'; import { LanguageClientOptions, RequestType, NotificationType, FormattingOptions as LSPFormattingOptions, @@ -51,7 +51,14 @@ interface DocumentSortingParams { } namespace DocumentSortingRequest { - export const type: RequestType = new RequestType('json/sort'); + export interface ITextEdit { + range: { + start: { line: number; character: number }; + end: { line: number; character: number }; + }; + newText: string; + } + export const type: RequestType = new RequestType('json/sort'); } export interface ISchemaAssociations { @@ -95,6 +102,7 @@ export type JSONSchemaSettings = { export namespace SettingIds { export const enableFormatter = 'json.format.enable'; export const enableKeepLines = 'json.format.keepLines'; + export const enableSortOnSave = 'json.sortOnSave.enable'; export const enableValidation = 'json.validate.enable'; export const enableSchemaDownload = 'json.schemaDownload.enable'; export const maxItemsComputed = 'json.maxItemsComputed'; @@ -163,25 +171,23 @@ export async function startClient(context: ExtensionContext, newLanguageClient: window.showInformationMessage(l10n.t('JSON schema cache cleared.')); })); + toDispose.push(workspace.onWillSaveTextDocument(event => { + const sortOnSave = workspace.getConfiguration().get(SettingIds.enableSortOnSave); + const document = event.document; + if (sortOnSave && (document.languageId === 'json' || document.languageId === 'jsonc')) { + const documentOptions = getOptionsForDocument(document); + const textEditsPromise = getSortTextEdits(document, documentOptions?.tabSize, documentOptions?.insertSpaces); + event.waitUntil(textEditsPromise); + } + })); + toDispose.push(commands.registerCommand('json.sort', async () => { if (isClientReady) { const textEditor = window.activeTextEditor; if (textEditor) { - const document = textEditor.document; - const filesConfig = workspace.getConfiguration('files', document); - const options: SortOptions = { - tabSize: textEditor.options.tabSize ? Number(textEditor.options.tabSize) : 4, - insertSpaces: textEditor.options.insertSpaces ? Boolean(textEditor.options.insertSpaces) : true, - trimTrailingWhitespace: filesConfig.get('trimTrailingWhitespace'), - trimFinalNewlines: filesConfig.get('trimFinalNewlines'), - insertFinalNewline: filesConfig.get('insertFinalNewline'), - }; - const params: DocumentSortingParams = { - uri: document.uri.toString(), - options - }; - const textEdits = await client.sendRequest(DocumentSortingRequest.type, params); + const documentOptions = textEditor.options; + const textEdits = await getSortTextEdits(textEditor.document, documentOptions.tabSize, documentOptions.insertSpaces); const success = await textEditor.edit(mutator => { for (const edit of textEdits) { mutator.replace(client.protocol2CodeConverter.asRange(edit.range), edit.newText); @@ -471,6 +477,29 @@ export async function startClient(context: ExtensionContext, newLanguageClient: } } + async function getSortTextEdits(document: TextDocument, tabSize: string | number = 4, insertSpaces: string | boolean = true): Promise { + const filesConfig = workspace.getConfiguration('files', document); + const options: SortOptions = { + tabSize: Number(tabSize), + insertSpaces: Boolean(insertSpaces), + trimTrailingWhitespace: filesConfig.get('trimTrailingWhitespace'), + trimFinalNewlines: filesConfig.get('trimFinalNewlines'), + insertFinalNewline: filesConfig.get('insertFinalNewline'), + }; + const params: DocumentSortingParams = { + uri: document.uri.toString(), + options + }; + const edits = await client.sendRequest(DocumentSortingRequest.type, params); + // Here we convert the JSON objects to real TextEdit objects + return edits.map((edit) => { + return new TextEdit( + new Range(edit.range.start.line, edit.range.start.character, edit.range.end.line, edit.range.end.character), + edit.newText + ); + }); + } + return client; } @@ -614,3 +643,12 @@ function updateMarkdownString(h: MarkdownString): MarkdownString { function isSchemaResolveError(d: Diagnostic) { return d.code === /* SchemaResolveError */ 0x300; } + +function getOptionsForDocument(document: TextDocument): TextEditorOptions | undefined { + for (const editor of window.visibleTextEditors) { + if (editor.document.uri.toString() === document.uri.toString()) { + return editor.options; + } + } + return; +} diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json index c87a6832422..0d6b88408ef 100644 --- a/extensions/json-language-features/package.json +++ b/extensions/json-language-features/package.json @@ -91,6 +91,12 @@ "default": false, "description": "%json.format.keepLines.desc%" }, + "json.sortOnSave.enable": { + "type": "boolean", + "scope": "window", + "default": false, + "description": "%json.sortOnSave.enable.desc%" + }, "json.trace.server": { "type": "string", "scope": "window", @@ -160,7 +166,7 @@ "dependencies": { "@vscode/extension-telemetry": "^0.7.5", "request-light": "^0.7.0", - "vscode-languageclient": "^8.2.0-next.0" + "vscode-languageclient": "^8.2.0-next.1" }, "devDependencies": { "@types/node": "16.x" diff --git a/extensions/json-language-features/package.nls.json b/extensions/json-language-features/package.nls.json index 571d047802d..4091dad211a 100644 --- a/extensions/json-language-features/package.nls.json +++ b/extensions/json-language-features/package.nls.json @@ -8,6 +8,7 @@ "json.schemas.schema.desc": "The schema definition for the given URL. The schema only needs to be provided to avoid accesses to the schema URL.", "json.format.enable.desc": "Enable/disable default JSON formatter", "json.format.keepLines.desc" : "Keep all existing new lines when formatting.", + "json.sortOnSave.enable.desc": "Enable/disable default sorting on save", "json.validate.enable.desc": "Enable/disable JSON validation.", "json.tracing.desc": "Traces the communication between VS Code and the JSON language server.", "json.colorDecorators.enable.desc": "Enables or disables color decorators", diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json index 0f5c8ecab41..72e707a58e6 100644 --- a/extensions/json-language-features/server/package.json +++ b/extensions/json-language-features/server/package.json @@ -12,11 +12,11 @@ }, "main": "./out/node/jsonServerMain", "dependencies": { - "@vscode/l10n": "^0.0.13", + "@vscode/l10n": "^0.0.14", "jsonc-parser": "^3.2.0", "request-light": "^0.7.0", "vscode-json-languageservice": "^5.3.5", - "vscode-languageserver": "^8.2.0-next.0", + "vscode-languageserver": "^8.2.0-next.1", "vscode-uri": "^3.0.7" }, "devDependencies": { diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock index 25f7c9eb1f3..c8fabcbc15c 100644 --- a/extensions/json-language-features/server/yarn.lock +++ b/extensions/json-language-features/server/yarn.lock @@ -17,6 +17,11 @@ resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.13.tgz#f51ff130b8c98f189476c5f812d214b8efb09590" integrity sha512-A3uY356uOU9nGa+TQIT/i3ziWUgJjVMUrGGXSrtRiTwklyCFjGVWIOHoEIHbJpiyhDkJd9kvIWUOfXK1IkK8XQ== +"@vscode/l10n@^0.0.14": + version "0.0.14" + resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.14.tgz#431e5814c35c3cb11ee21873bc70a4b0fbf90fcf" + integrity sha512-/yrv59IEnmh655z1oeDnGcvMYwnEzNzHLgeYcQCkhYX0xBvYWrAuefoiLcPBUkMpJsb46bqQ6Yv4pwTTQ4d3Qg== + jsonc-parser@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" @@ -43,10 +48,10 @@ vscode-jsonrpc@8.2.0-next.0: resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageserver-protocol@3.17.4-next.0: - version "3.17.4-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" - integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== +vscode-languageserver-protocol@3.17.4-next.1: + version "3.17.4-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.1.tgz#a15480e1bc663853ae90ded226efafc5ab333616" + integrity sha512-qrK4BycgPR/+nkRN9PRVTblkLp+kUPUmAgF6rDhFzZIPXW4/MqWwFUT8uswIMGdlTPPgCEkFO/AYEZK1fDXODg== dependencies: vscode-jsonrpc "8.2.0-next.0" vscode-languageserver-types "3.17.4-next.0" @@ -66,12 +71,12 @@ vscode-languageserver-types@^3.17.3: resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64" integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA== -vscode-languageserver@^8.2.0-next.0: - version "8.2.0-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.2.0-next.0.tgz#ad9bcef650e0bae9d32591ebbda3eb5e548418a7" - integrity sha512-Pw1pdR+hZvaeeVvbmEscUJG0SMMa5//iV+OnFuv4cPPvk+ohe4mtrVAcI06Z9HIMxDu+2McqY1b8JbVvyRKFtg== +vscode-languageserver@^8.2.0-next.1: + version "8.2.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.2.0-next.1.tgz#ad2558d74392b1cfaccd427febe9a368fc328f8b" + integrity sha512-994AXMKBijzjlnpf8p9M+ntsNJDjR8pr55NJPYxKjy/nUhVkg962dAomelH6Z94401kBZmSbfP/K/20cB54aFA== dependencies: - vscode-languageserver-protocol "3.17.4-next.0" + vscode-languageserver-protocol "3.17.4-next.1" vscode-uri@^3.0.7: version "3.0.7" diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock index e9eef45f314..6113220bc30 100644 --- a/extensions/json-language-features/yarn.lock +++ b/extensions/json-language-features/yarn.lock @@ -354,14 +354,14 @@ request-light@^0.7.0: integrity sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q== semver@^5.3.0, semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" @@ -390,19 +390,19 @@ vscode-jsonrpc@8.2.0-next.0: resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageclient@^8.2.0-next.0: - version "8.2.0-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.2.0-next.0.tgz#7415c831c4c1e38cc08e710e744c36c5d2251bd8" - integrity sha512-Gqr47Up5VDuRT8JrfB0QFGXR9ngQDkfIJfbT0xmM4OIsISqH3uUgXHTAhekRtS4N6aER3UvGXUrrRWQUaBGYHA== +vscode-languageclient@^8.2.0-next.1: + version "8.2.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.2.0-next.1.tgz#a3f98b80cfa3225fde0583aa6a5c9b20219fa37e" + integrity sha512-oITaqHQ10PM3zXCUu/104wriMeDutXMkQXMaRBWh1jKihcNcUBLC/os7RhqiVGypY0nl+F0pwStAf4Koc8inaw== dependencies: minimatch "^5.1.0" semver "^7.3.7" - vscode-languageserver-protocol "3.17.4-next.0" + vscode-languageserver-protocol "3.17.4-next.1" -vscode-languageserver-protocol@3.17.4-next.0: - version "3.17.4-next.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" - integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== +vscode-languageserver-protocol@3.17.4-next.1: + version "3.17.4-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.1.tgz#a15480e1bc663853ae90ded226efafc5ab333616" + integrity sha512-qrK4BycgPR/+nkRN9PRVTblkLp+kUPUmAgF6rDhFzZIPXW4/MqWwFUT8uswIMGdlTPPgCEkFO/AYEZK1fDXODg== dependencies: vscode-jsonrpc "8.2.0-next.0" vscode-languageserver-types "3.17.4-next.0" diff --git a/extensions/json/build/update-grammars.js b/extensions/json/build/update-grammars.js index 3fb40c86623..2b7f76f8f90 100644 --- a/extensions/json/build/update-grammars.js +++ b/extensions/json/build/update-grammars.js @@ -6,16 +6,16 @@ var updateGrammar = require('vscode-grammar-updater'); -function adaptJSON(grammar, replacementScope) { - grammar.name = 'JSON with comments'; +function adaptJSON(grammar, name, replacementScope, replaceeScope = 'json') { + grammar.name = name; grammar.scopeName = `source${replacementScope}`; - + const regex = new RegExp(`\.${replaceeScope}`, 'g'); var fixScopeNames = function (rule) { if (typeof rule.name === 'string') { - rule.name = rule.name.replace(/\.json/g, replacementScope); + rule.name = rule.name.replace(regex, replacementScope); } if (typeof rule.contentName === 'string') { - rule.contentName = rule.contentName.replace(/\.json/g, replacementScope); + rule.contentName = rule.contentName.replace(regex, replacementScope); } for (var property in rule) { var value = rule[property]; @@ -33,9 +33,7 @@ function adaptJSON(grammar, replacementScope) { var tsGrammarRepo = 'microsoft/vscode-JSON.tmLanguage'; updateGrammar.update(tsGrammarRepo, 'JSON.tmLanguage', './syntaxes/JSON.tmLanguage.json'); -updateGrammar.update(tsGrammarRepo, 'JSON.tmLanguage', './syntaxes/JSONC.tmLanguage.json', grammar => adaptJSON(grammar, '.json.comments')); - - - - +updateGrammar.update(tsGrammarRepo, 'JSON.tmLanguage', './syntaxes/JSONC.tmLanguage.json', grammar => adaptJSON(grammar, 'JSON with Comments', '.json.comments')); +updateGrammar.update(tsGrammarRepo, 'JSON.tmLanguage', './syntaxes/JSONL.tmLanguage.json', grammar => adaptJSON(grammar, 'JSON Lines', '.json.lines')); +updateGrammar.update('jeff-hykin/better-snippet-syntax', 'autogenerated/jsonc.tmLanguage.json', './syntaxes/snippets.tmLanguage.json', grammar => adaptJSON(grammar, 'Snippets', '.json.comments.snippets', 'json.comments')); diff --git a/extensions/json/cgmanifest.json b/extensions/json/cgmanifest.json index 1af8426e535..fe6b0ae6e6d 100644 --- a/extensions/json/cgmanifest.json +++ b/extensions/json/cgmanifest.json @@ -11,6 +11,18 @@ }, "license": "MIT", "version": "0.0.0" + }, + { + "component": { + "type": "git", + "git": { + "name": "jeff-hykin/better-snippet-syntax", + "repositoryUrl": "https://github.com/jeff-hykin/better-snippet-syntax", + "commitHash": "2b1bb124cb2b9c75c3c80eae1b8f3a043841d654" + } + }, + "license": "MIT", + "version": "1.0.2" } ], "version": 1 diff --git a/extensions/json/package.json b/extensions/json/package.json index ba3b94b8c78..7834eb38d75 100644 --- a/extensions/json/package.json +++ b/extensions/json/package.json @@ -31,7 +31,8 @@ ".jslintrc", ".jsonld", ".geojson", - ".ipynb" + ".ipynb", + ".vuerc" ], "filenames": [ "composer.lock", @@ -65,6 +66,31 @@ "typedoc.json" ], "configuration": "./language-configuration.json" + }, + { + "id": "jsonl", + "aliases": [ + "JSON Lines" + ], + "extensions": [ + ".jsonl" + ], + "filenames": [], + "configuration": "./language-configuration.json" + }, + { + "id": "snippets", + "aliases": [ + "Code Snippets" + ], + "extensions": [ + ".code-snippets" + ], + "filenamePatterns": [ + "**/User/snippets/*.json", + "**/User/profiles/*/snippets/*.json" + ], + "configuration": "./language-configuration.json" } ], "grammars": [ @@ -77,6 +103,16 @@ "language": "jsonc", "scopeName": "source.json.comments", "path": "./syntaxes/JSONC.tmLanguage.json" + }, + { + "language": "jsonl", + "scopeName": "source.json.lines", + "path": "./syntaxes/JSONL.tmLanguage.json" + }, + { + "language": "snippets", + "scopeName": "source.json.comments.snippets", + "path": "./syntaxes/snippets.tmLanguage.json" } ] }, diff --git a/extensions/json/syntaxes/JSONC.tmLanguage.json b/extensions/json/syntaxes/JSONC.tmLanguage.json index 31828ba65bb..ae5430630f6 100644 --- a/extensions/json/syntaxes/JSONC.tmLanguage.json +++ b/extensions/json/syntaxes/JSONC.tmLanguage.json @@ -5,7 +5,7 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70", - "name": "JSON with comments", + "name": "JSON with Comments", "scopeName": "source.json.comments", "patterns": [ { diff --git a/extensions/json/syntaxes/JSONL.tmLanguage.json b/extensions/json/syntaxes/JSONL.tmLanguage.json new file mode 100644 index 00000000000..26de8d856f8 --- /dev/null +++ b/extensions/json/syntaxes/JSONL.tmLanguage.json @@ -0,0 +1,213 @@ +{ + "information_for_contributors": [ + "This file has been converted from https://github.com/microsoft/vscode-JSON.tmLanguage/blob/master/JSON.tmLanguage", + "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/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70", + "name": "JSON Lines", + "scopeName": "source.json.lines", + "patterns": [ + { + "include": "#value" + } + ], + "repository": { + "array": { + "begin": "\\[", + "beginCaptures": { + "0": { + "name": "punctuation.definition.array.begin.json.lines" + } + }, + "end": "\\]", + "endCaptures": { + "0": { + "name": "punctuation.definition.array.end.json.lines" + } + }, + "name": "meta.structure.array.json.lines", + "patterns": [ + { + "include": "#value" + }, + { + "match": ",", + "name": "punctuation.separator.array.json.lines" + }, + { + "match": "[^\\s\\]]", + "name": "invalid.illegal.expected-array-separator.json.lines" + } + ] + }, + "comments": { + "patterns": [ + { + "begin": "/\\*\\*(?!/)", + "captures": { + "0": { + "name": "punctuation.definition.comment.json.lines" + } + }, + "end": "\\*/", + "name": "comment.block.documentation.json.lines" + }, + { + "begin": "/\\*", + "captures": { + "0": { + "name": "punctuation.definition.comment.json.lines" + } + }, + "end": "\\*/", + "name": "comment.block.json.lines" + }, + { + "captures": { + "1": { + "name": "punctuation.definition.comment.json.lines" + } + }, + "match": "(//).*$\\n?", + "name": "comment.line.double-slash.js" + } + ] + }, + "constant": { + "match": "\\b(?:true|false|null)\\b", + "name": "constant.language.json.lines" + }, + "number": { + "match": "(?x) # turn on extended mode\n -? # an optional minus\n (?:\n 0 # a zero\n | # ...or...\n [1-9] # a 1-9 character\n \\d* # followed by zero or more digits\n )\n (?:\n (?:\n \\. # a period\n \\d+ # followed by one or more digits\n )?\n (?:\n [eE] # an e character\n [+-]? # followed by an option +/-\n \\d+ # followed by one or more digits\n )? # make exponent optional\n )? # make decimal portion optional", + "name": "constant.numeric.json.lines" + }, + "object": { + "begin": "\\{", + "beginCaptures": { + "0": { + "name": "punctuation.definition.dictionary.begin.json.lines" + } + }, + "end": "\\}", + "endCaptures": { + "0": { + "name": "punctuation.definition.dictionary.end.json.lines" + } + }, + "name": "meta.structure.dictionary.json.lines", + "patterns": [ + { + "comment": "the JSON object key", + "include": "#objectkey" + }, + { + "include": "#comments" + }, + { + "begin": ":", + "beginCaptures": { + "0": { + "name": "punctuation.separator.dictionary.key-value.json.lines" + } + }, + "end": "(,)|(?=\\})", + "endCaptures": { + "1": { + "name": "punctuation.separator.dictionary.pair.json.lines" + } + }, + "name": "meta.structure.dictionary.value.json.lines", + "patterns": [ + { + "comment": "the JSON object value", + "include": "#value" + }, + { + "match": "[^\\s,]", + "name": "invalid.illegal.expected-dictionary-separator.json.lines" + } + ] + }, + { + "match": "[^\\s\\}]", + "name": "invalid.illegal.expected-dictionary-separator.json.lines" + } + ] + }, + "string": { + "begin": "\"", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.json.lines" + } + }, + "end": "\"", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.json.lines" + } + }, + "name": "string.quoted.double.json.lines", + "patterns": [ + { + "include": "#stringcontent" + } + ] + }, + "objectkey": { + "begin": "\"", + "beginCaptures": { + "0": { + "name": "punctuation.support.type.property-name.begin.json.lines" + } + }, + "end": "\"", + "endCaptures": { + "0": { + "name": "punctuation.support.type.property-name.end.json.lines" + } + }, + "name": "string.json.lines support.type.property-name.json.lines", + "patterns": [ + { + "include": "#stringcontent" + } + ] + }, + "stringcontent": { + "patterns": [ + { + "match": "(?x) # turn on extended mode\n \\\\ # a literal backslash\n (?: # ...followed by...\n [\"\\\\/bfnrt] # one of these characters\n | # ...or...\n u # a u\n [0-9a-fA-F]{4}) # and four hex digits", + "name": "constant.character.escape.json.lines" + }, + { + "match": "\\\\.", + "name": "invalid.illegal.unrecognized-string-escape.json.lines" + } + ] + }, + "value": { + "patterns": [ + { + "include": "#constant" + }, + { + "include": "#number" + }, + { + "include": "#string" + }, + { + "include": "#array" + }, + { + "include": "#object" + }, + { + "include": "#comments" + } + ] + } + } +} \ No newline at end of file diff --git a/extensions/json/syntaxes/snippets.tmLanguage.json b/extensions/json/syntaxes/snippets.tmLanguage.json new file mode 100644 index 00000000000..289bc18f8c6 --- /dev/null +++ b/extensions/json/syntaxes/snippets.tmLanguage.json @@ -0,0 +1,7463 @@ +{ + "information_for_contributors": [ + "This file has been converted from https://github.com/jeff-hykin/better-snippet-syntax/blob/master/autogenerated/jsonc.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/jeff-hykin/better-snippet-syntax/commit/2b1bb124cb2b9c75c3c80eae1b8f3a043841d654", + "name": "Snippets", + "scopeName": "source.json.comments.snippets", + "patterns": [ + { + "include": "#value" + } + ], + "repository": { + "array": { + "begin": "\\[", + "beginCaptures": { + "0": { + "name": "punctuation.definition.array.begin.json.comments.snippets" + } + }, + "end": "\\]", + "endCaptures": { + "0": { + "name": "punctuation.definition.array.end.json.comments.snippets" + } + }, + "name": "meta.structure.array.json.comments.snippets", + "patterns": [ + { + "include": "#value" + }, + { + "match": ",", + "name": "punctuation.separator.array.json.comments.snippets" + }, + { + "match": "[^\\s\\]]", + "name": "invalid.illegal.expected-array-separator.json.comments.snippets" + } + ] + }, + "basic_escape": { + "match": "\\\\(?:[\"\\\\\\/bfnrt]|(?:u[0-9a-fA-F]{4}))", + "name": "constant.character.escape.json.comments.snippets" + }, + "bnf_any": { + "match": "(?:\\}|((?:(?:(?:(?:(?:(?:((?:(\\$)([0-9]+)))|((?:(?:(\\$)(\\{))([0-9]+)(\\}))))|((?:(?:(\\$)(\\{))([0-9]+)((?:(\\/)((?:(?:(?:(?:(\\\\)(\\\\\\/))|(?:(\\\\\\\\\\\\)(\\\\\\/)))|[^\\/\\n])+))(\\/)(((?:(?:(?:(?:(?:(?:(?:(?:\\$(?:(?)*?))(\\|)(\\}))))|((?:(?:(\\$)(\\{))([0-9]+)(:)(?:(?:(?:(?:(?:\\$(?:[0-9]+))|(?:(?:\\$\\{)(?:[0-9]+)\\}))|(?:(?:\\$\\{)(?:[0-9]+)(?:\\/((?:(?:(?:(?:\\\\(?:\\\\\\/))|(?:(?:\\\\\\\\\\\\)(?:\\\\\\/)))|[^\\/\\n])+))\\/((?:(?:(?:(?:(?:(?:(?:(?:(?:\\$(?:(?)+)(\\}))))|(?:(?:(?:((?:(\\$)((?+))(\\}))))|((?:(?:(\\$)(\\{))((?)*?))(\\|)(\\}))", + "captures": { + "1": { + "name": "punctuation.section.insertion.dollar.brackets.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.dollar.brackets.json.comments.snippets" + }, + "2": { + "name": "punctuation.section.insertion.bracket.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.bracket.json.comments.snippets" + }, + "3": { + "name": "variable.other.normal.json.comments.snippets custom.variable.other.normal.numeric.json.comments.snippets" + }, + "4": { + "name": "punctuation.separator.choice.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.separator.choice.json.comments.snippets" + }, + "5": { + "patterns": [ + { + "match": ",", + "name": "meta.insertion.choice.json.comments.snippets punctuation.separator.comma.json.comments.snippets" + }, + { + "include": "#choice_option" + } + ] + }, + "6": { + "name": "meta.insertion.choice.json.comments.snippets constant.other.option.json.comments.snippets" + }, + "7": { + "name": "punctuation.section.insertion.escape.escaper.json.comments.snippets comment.block.json.comments.snippets punctuation.definition.comment.insertion.escape.json.comments.snippets" + }, + "8": { + "name": "constant.character.escape.json.comments.snippets" + }, + "9": { + "name": "punctuation.section.insertion.escape.escaper.json.comments.snippets comment.block.json.comments.snippets punctuation.definition.comment.insertion.escape.json.comments.snippets" + }, + "10": { + "patterns": [ + { + "include": "#quad_backslash_match" + }, + { + "include": "#dollar_sign_escape" + }, + { + "include": "#bracket_escape" + }, + { + "include": "#basic_escape" + }, + { + "include": "#invalid_escape" + }, + { + "include": "#normal_characters" + } + ] + }, + "11": { + "patterns": [ + { + "include": "#quad_backslash_match" + }, + { + "match": "(\\\\\\\\)\\$", + "captures": { + "1": { + "name": "punctuation.section.insertion.escape.escaper.json.comments.snippets comment.block.json.comments.snippets punctuation.definition.comment.insertion.escape.json.comments.snippets" + } + }, + "name": "punctuation.section.insertion.escape.escapee.json.comments.snippets string.regexp.insertion.escape.json.comments.snippets string.quoted.double.json.comments.snippets" + }, + { + "include": "#invalid_escape" + } + ] + }, + "12": { + "patterns": [ + { + "include": "#quad_backslash_match" + }, + { + "match": "(\\\\\\\\)\\}", + "captures": { + "1": { + "name": "punctuation.section.insertion.escape.escaper.json.comments.snippets comment.block.json.comments.snippets punctuation.definition.comment.insertion.escape.json.comments.snippets" + } + }, + "name": "punctuation.section.insertion.escape.escapee.json.comments.snippets string.regexp.insertion.escape.json.comments.snippets string.quoted.double.json.comments.snippets" + } + ] + }, + "13": { + "name": "constant.character.escape.json.comments.snippets" + }, + "14": { + "name": "punctuation.separator.choice.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.separator.choice.json.comments.snippets" + }, + "15": { + "name": "punctuation.section.insertion.bracket.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.bracket.json.comments.snippets" + } + }, + "name": "meta.insertion.brackets.json.comments.snippets meta.insertion.choice.json.comments.snippets" + }, + "bnf_format": { + "match": "(?:(?:(?:(?:(?:(?:(?:(\\$)((?]+?)(>)|(\\S+?)) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in parensā€¦\n | ((\").+?(\")) # or in double quotesā€¦\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n $\n", + "match": "(?x)\n \\s* # Leading whitespace\n (\\[)([^]]+?)(\\])(:) # Reference name\n [ \\t]* # Optional whitespace\n (?:(<)((?:\\\\[<>]|[^<>\\n])*)(>)|(\\S+?)) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in parensā€¦\n | ((\").+?(\")) # or in double quotesā€¦\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n $\n", "name": "meta.link.reference.def.markdown" }, "list_paragraph": { @@ -2641,47 +2641,50 @@ "5": { "name": "punctuation.definition.metadata.markdown" }, - "6": { - "name": "punctuation.definition.link.markdown" - }, "7": { - "name": "markup.underline.link.image.markdown" + "name": "punctuation.definition.link.markdown" }, "8": { - "name": "punctuation.definition.link.markdown" + "name": "markup.underline.link.image.markdown" }, "9": { - "name": "string.other.link.description.title.markdown" + "name": "punctuation.definition.link.markdown" }, "10": { - "name": "punctuation.definition.string.markdown" - }, - "11": { - "name": "punctuation.definition.string.markdown" + "name": "markup.underline.link.image.markdown" }, "12": { "name": "string.other.link.description.title.markdown" }, "13": { - "name": "punctuation.definition.string.markdown" + "name": "punctuation.definition.string.begin.markdown" }, "14": { - "name": "punctuation.definition.string.markdown" + "name": "punctuation.definition.string.end.markdown" }, "15": { "name": "string.other.link.description.title.markdown" }, "16": { - "name": "punctuation.definition.string.markdown" + "name": "punctuation.definition.string.begin.markdown" }, "17": { - "name": "punctuation.definition.string.markdown" + "name": "punctuation.definition.string.end.markdown" }, "18": { + "name": "string.other.link.description.title.markdown" + }, + "19": { + "name": "punctuation.definition.string.begin.markdown" + }, + "20": { + "name": "punctuation.definition.string.end.markdown" + }, + "21": { "name": "punctuation.definition.metadata.markdown" } }, - "match": "(?x)\n (\\!\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n (?) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in parensā€¦\n | ((\").+?(\")) # or in double quotesā€¦\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", + "match": "(?x)\n (\\!\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n # The url\n [ \\t]*\n (\n (<)((?:\\\\[<>]|[^<>\\n])*)(>)\n | ((?(?>[^\\s()]+)|\\(\\g*\\))*)\n )\n [ \\t]*\n (?:\n ((\\().+?(\\))) # Match title in parensā€¦\n | ((\").+?(\")) # or in double quotesā€¦\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", "name": "meta.image.inline.markdown" }, "image-ref": { @@ -2876,7 +2879,7 @@ "name": "punctuation.definition.metadata.markdown" } }, - "match": "(?x)\n (\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n # The url\n [ \\t]*\n (\n (<)([^<>\\n]*)(>)\n | ((?(?>[^\\s()]+)|\\(\\g*\\))*)\n )\n [ \\t]*\n # The title \n (?:\n ((\\()[^()]*(\\))) # Match title in parensā€¦\n | ((\")[^\"]*(\")) # or in double quotesā€¦\n | ((')[^']*(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", + "match": "(?x)\n (\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n # The url\n [ \\t]*\n (\n (<)((?:\\\\[<>]|[^<>\\n])*)(>)\n | ((?(?>[^\\s()]+)|\\(\\g*\\))*)\n )\n [ \\t]*\n # The title \n (?:\n ((\\()[^()]*(\\))) # Match title in parensā€¦\n | ((\")[^\"]*(\")) # or in double quotesā€¦\n | ((')[^']*(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", "name": "meta.link.inline.markdown" }, "link-ref": { diff --git a/extensions/lua/cgmanifest.json b/extensions/lua/cgmanifest.json index a67ee9d9177..0721cb91ace 100644 --- a/extensions/lua/cgmanifest.json +++ b/extensions/lua/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "sumneko/lua.tmbundle", "repositoryUrl": "https://github.com/sumneko/lua.tmbundle", - "commitHash": "d0d89a3734dd36938d8498a3c16bc734291727cb" + "commitHash": "3a18700941737c3ab66ac5964696f141aee61800" } }, "licenseDetail": [ diff --git a/extensions/lua/syntaxes/lua.tmLanguage.json b/extensions/lua/syntaxes/lua.tmLanguage.json index 66be4227967..c28465b5ce6 100644 --- a/extensions/lua/syntaxes/lua.tmLanguage.json +++ b/extensions/lua/syntaxes/lua.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/sumneko/lua.tmbundle/commit/d0d89a3734dd36938d8498a3c16bc734291727cb", + "version": "https://github.com/sumneko/lua.tmbundle/commit/3a18700941737c3ab66ac5964696f141aee61800", "name": "Lua", "scopeName": "source.lua", "patterns": [ @@ -184,7 +184,7 @@ }, { "match": "\\b(and|or|not|\\|\\||\\&\\&|\\!)\\b", - "name": "keyword.operator.logical.lua" + "name": "keyword.operator.lua" }, { "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[))", @@ -372,7 +372,10 @@ "name": "comment.block.lua", "patterns": [ { - "include": "#comment_documentation_bracket" + "include": "#emmydoc" + }, + { + "include": "#ldoc_tag" } ] }, @@ -437,36 +440,15 @@ "name": "comment.block.lua", "patterns": [ { - "include": "#comment_documentation_asterisk" + "include": "#emmydoc" + }, + { + "include": "#ldoc_tag" } ] } ] }, - "comment_documentation_asterisk": { - "begin": "(?<=/\\*\\*)([^*]|\\*(?!/))*$", - " ": "^[ \\t]*\\*(?!/)(?=([^*]|[*](?!/))*$)", - "patterns": [ - { - "include": "#emmydoc" - }, - { - "include": "#ldoc_tag" - } - ] - }, - "comment_documentation_bracket": { - "begin": "(?<=--\\[\\[)([^-]|\\-(?!\\]\\]))*$", - "while": "^[ \\t]*-*(?!\\]\\])(?=([^-]|[-](?!\\]\\]))*$)", - "patterns": [ - { - "include": "#emmydoc" - }, - { - "include": "#ldoc_tag" - } - ] - }, "emmydoc": { "patterns": [ { diff --git a/extensions/mangle-loader.js b/extensions/mangle-loader.js index 170575e7eea..b6b22ce3f1a 100644 --- a/extensions/mangle-loader.js +++ b/extensions/mangle-loader.js @@ -8,12 +8,12 @@ const fs = require('fs'); const webpack = require('webpack'); const fancyLog = require('fancy-log'); const ansiColors = require('ansi-colors'); -const { Mangler } = require('../build/lib/mangleTypeScript'); +const { Mangler } = require('../build/lib/mangle/index'); /** * Map of project paths to mangled file contents * - * @type {Map>} + * @type {Map>>} */ const mangleMap = new Map(); @@ -25,7 +25,7 @@ function getMangledFileContents(projectPath) { if (!entry) { const log = (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data); log(`Mangling ${projectPath}`); - const ts2tsMangler = new Mangler(projectPath, log); + const ts2tsMangler = new Mangler(projectPath, log, { mangleExports: true, manglePrivateFields: true }); entry = ts2tsMangler.computeNewFileContents(); mangleMap.set(projectPath, entry); } @@ -41,6 +41,11 @@ module.exports = async function (source, sourceMap, meta) { // Only enable mangling in production builds return source; } + const options = this.getOptions(); + if (options.disabled) { + // Dynamically disabled + return source; + } if (source !== fs.readFileSync(this.resourcePath).toString()) { // File content has changed by previous webpack steps. @@ -48,10 +53,9 @@ module.exports = async function (source, sourceMap, meta) { return source; } - const options = this.getOptions(); const callback = this.async(); - const fileContentsMap = getMangledFileContents(options.configFile); + const fileContentsMap = await getMangledFileContents(options.configFile); const newContents = fileContentsMap.get(this.resourcePath); callback(null, newContents?.out ?? source, sourceMap, meta); diff --git a/extensions/markdown-basics/cgmanifest.json b/extensions/markdown-basics/cgmanifest.json index d914bf08dcb..bb88d5a8bf8 100644 --- a/extensions/markdown-basics/cgmanifest.json +++ b/extensions/markdown-basics/cgmanifest.json @@ -33,7 +33,7 @@ "git": { "name": "microsoft/vscode-markdown-tm-grammar", "repositoryUrl": "https://github.com/microsoft/vscode-markdown-tm-grammar", - "commitHash": "ca2caf2157d0674be3d641f71499b84d514e4e5e" + "commitHash": "c635942289ebf40954e69cf3637aac906465ade8" } }, "license": "MIT", diff --git a/extensions/markdown-basics/language-configuration.json b/extensions/markdown-basics/language-configuration.json index 6d59777e02e..40f4be77c1d 100644 --- a/extensions/markdown-basics/language-configuration.json +++ b/extensions/markdown-basics/language-configuration.json @@ -8,12 +8,20 @@ }, // symbols used as brackets "brackets": [ - ["{", "}"], - ["[", "]"], - ["(", ")"] - ], - "colorizedBracketPairs": [ + [ + "{", + "}" + ], + [ + "[", + "]" + ], + [ + "(", + ")" + ] ], + "colorizedBracketPairs": [], "autoClosingPairs": [ { "open": "{", @@ -33,17 +41,49 @@ "notIn": [ "string" ] - } + }, + { + "open": "`", + "close": "`" + }, + { + "open": "```", + "close": "```" + }, ], "surroundingPairs": [ - ["(", ")"], - ["[", "]"], - ["`", "`"], - ["_", "_"], - ["*", "*"], - ["{", "}"], - ["'", "'"], - ["\"", "\""] + [ + "(", + ")" + ], + [ + "[", + "]" + ], + [ + "`", + "`" + ], + [ + "_", + "_" + ], + [ + "*", + "*" + ], + [ + "{", + "}" + ], + [ + "'", + "'" + ], + [ + "\"", + "\"" + ] ], "folding": { "offSide": true, @@ -52,5 +92,8 @@ "end": "^\\s*" } }, - "wordPattern": { "pattern": "(\\p{Alphabetic}|\\p{Number}|\\p{Nonspacing_Mark})(((\\p{Alphabetic}|\\p{Number}|\\p{Nonspacing_Mark})|[_])?(\\p{Alphabetic}|\\p{Number}|\\p{Nonspacing_Mark}))*", "flags": "ug" }, + "wordPattern": { + "pattern": "(\\p{Alphabetic}|\\p{Number}|\\p{Nonspacing_Mark})(((\\p{Alphabetic}|\\p{Number}|\\p{Nonspacing_Mark})|[_])?(\\p{Alphabetic}|\\p{Number}|\\p{Nonspacing_Mark}))*", + "flags": "ug" + }, } diff --git a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json index 57e14e862a5..dcfa85d6e93 100644 --- a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json +++ b/extensions/markdown-basics/syntaxes/markdown.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/vscode-markdown-tm-grammar/commit/ca2caf2157d0674be3d641f71499b84d514e4e5e", + "version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/c635942289ebf40954e69cf3637aac906465ade8", "name": "Markdown", "scopeName": "text.html.markdown", "patterns": [ @@ -42,6 +42,9 @@ { "include": "#html" }, + { + "include": "#table" + }, { "include": "#paragraph" } @@ -2396,7 +2399,7 @@ "name": "punctuation.definition.string.end.markdown" } }, - "match": "(?x)\n \\s* # Leading whitespace\n (\\[)([^]]+?)(\\])(:) # Reference name\n [ \\t]* # Optional whitespace\n (?:(<)([^\\>]+?)(>)|(\\S+?)) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in parensā€¦\n | ((\").+?(\")) # or in double quotesā€¦\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n $\n", + "match": "(?x)\n \\s* # Leading whitespace\n (\\[)([^]]+?)(\\])(:) # Reference name\n [ \\t]* # Optional whitespace\n (?:(<)((?:\\\\[<>]|[^<>\\n])*)(>)|(\\S+?)) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in parensā€¦\n | ((\").+?(\")) # or in double quotesā€¦\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n $\n", "name": "meta.link.reference.def.markdown" }, "list_paragraph": { @@ -2437,7 +2440,7 @@ "while": "((^|\\G)([ ]{2,4}|\\t))|(^[ \\t]*$)" }, { - "begin": "(^|\\G)([ ]{0,3})([0-9]+\\.)([ \\t])", + "begin": "(^|\\G)([ ]{0,3})([0-9]+[\\.\\)])([ \\t])", "beginCaptures": { "3": { "name": "punctuation.definition.list.begin.markdown" @@ -2457,7 +2460,7 @@ ] }, "paragraph": { - "begin": "(^|\\G)[ ]{0,3}(?=\\S)", + "begin": "(^|\\G)[ ]{0,3}(?=[^ \\t\\n])", "name": "meta.paragraph.markdown", "patterns": [ { @@ -2470,7 +2473,7 @@ "include": "#heading-setext" } ], - "while": "(^|\\G)((?=\\s*[-=]{3,}\\s*$)|[ ]{4,}(?=\\S))" + "while": "(^|\\G)((?=\\s*[-=]{3,}\\s*$)|[ ]{4,}(?=[^ \\t\\n]))" }, "raw_block": { "begin": "(^|\\G)([ ]{4}|\\t)", @@ -2491,6 +2494,42 @@ ], "end": "(^|\\G)-{3}|\\.{3}\\s*$" }, + "table": { + "name": "markup.table.markdown", + "begin": "(^|\\G)(\\|)(?=[^|].+\\|\\s*$)", + "beginCaptures": { + "2": { + "name": "punctuation.definition.table.markdown" + } + }, + "while": "(^|\\G)(?=\\|)", + "patterns": [ + { + "match": "\\|", + "name": "punctuation.definition.table.markdown" + }, + { + "match": "(?<=\\|)\\s*(:?-+:?)\\s*(?=\\|)", + "captures": { + "1": { + "name": "punctuation.separator.table.markdown" + } + } + }, + { + "match": "(?<=\\|)\\s*(?=\\S)((\\\\\\||[^|])+)(?<=\\S)\\s*(?=\\|)", + "captures": { + "1": { + "patterns": [ + { + "include": "#inline" + } + ] + } + } + } + ] + }, "inline": { "patterns": [ { @@ -2635,47 +2674,50 @@ "5": { "name": "punctuation.definition.metadata.markdown" }, - "6": { - "name": "punctuation.definition.link.markdown" - }, "7": { - "name": "markup.underline.link.image.markdown" + "name": "punctuation.definition.link.markdown" }, "8": { - "name": "punctuation.definition.link.markdown" + "name": "markup.underline.link.image.markdown" }, "9": { - "name": "string.other.link.description.title.markdown" + "name": "punctuation.definition.link.markdown" }, "10": { - "name": "punctuation.definition.string.markdown" - }, - "11": { - "name": "punctuation.definition.string.markdown" + "name": "markup.underline.link.image.markdown" }, "12": { "name": "string.other.link.description.title.markdown" }, "13": { - "name": "punctuation.definition.string.markdown" + "name": "punctuation.definition.string.begin.markdown" }, "14": { - "name": "punctuation.definition.string.markdown" + "name": "punctuation.definition.string.end.markdown" }, "15": { "name": "string.other.link.description.title.markdown" }, "16": { - "name": "punctuation.definition.string.markdown" + "name": "punctuation.definition.string.begin.markdown" }, "17": { - "name": "punctuation.definition.string.markdown" + "name": "punctuation.definition.string.end.markdown" }, "18": { + "name": "string.other.link.description.title.markdown" + }, + "19": { + "name": "punctuation.definition.string.begin.markdown" + }, + "20": { + "name": "punctuation.definition.string.end.markdown" + }, + "21": { "name": "punctuation.definition.metadata.markdown" } }, - "match": "(?x)\n (\\!\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n (?) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in parensā€¦\n | ((\").+?(\")) # or in double quotesā€¦\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", + "match": "(?x)\n (\\!\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n # The url\n [ \\t]*\n (\n (<)((?:\\\\[<>]|[^<>\\n])*)(>)\n | ((?(?>[^\\s()]+)|\\(\\g*\\))*)\n )\n [ \\t]*\n (?:\n ((\\().+?(\\))) # Match title in parensā€¦\n | ((\").+?(\")) # or in double quotesā€¦\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", "name": "meta.image.inline.markdown" }, "image-ref": { @@ -2870,7 +2912,7 @@ "name": "punctuation.definition.metadata.markdown" } }, - "match": "(?x)\n (\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n # The url\n [ \\t]*\n (\n (<)([^<>\\n]*)(>)\n | ((?(?>[^\\s()]+)|\\(\\g*\\))*)\n )\n [ \\t]*\n # The title \n (?:\n ((\\()[^()]*(\\))) # Match title in parensā€¦\n | ((\")[^\"]*(\")) # or in double quotesā€¦\n | ((')[^']*(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", + "match": "(?x)\n (\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n # The url\n [ \\t]*\n (\n (<)((?:\\\\[<>]|[^<>\\n])*)(>)\n | ((?(?>[^\\s()]+)|\\(\\g*\\))*)\n )\n [ \\t]*\n # The title \n (?:\n ((\\()[^()]*(\\))) # Match title in parensā€¦\n | ((\")[^\"]*(\")) # or in double quotesā€¦\n | ((')[^']*(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", "name": "meta.link.inline.markdown" }, "link-ref": { diff --git a/extensions/markdown-language-features/esbuild-notebook.js b/extensions/markdown-language-features/esbuild-notebook.js index fb32a3e986e..87275940f4c 100644 --- a/extensions/markdown-language-features/esbuild-notebook.js +++ b/extensions/markdown-language-features/esbuild-notebook.js @@ -4,42 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // @ts-check const path = require('path'); -const esbuild = require('esbuild'); - -const args = process.argv.slice(2); - -const isWatch = args.indexOf('--watch') >= 0; - -let outputRoot = __dirname; -const outputRootIndex = args.indexOf('--outputRoot'); -if (outputRootIndex >= 0) { - outputRoot = args[outputRootIndex + 1]; -} const srcDir = path.join(__dirname, 'notebook'); -const outDir = path.join(outputRoot, 'notebook-out'); +const outDir = path.join(__dirname, 'notebook-out'); -function build() { - return esbuild.build({ - entryPoints: [ - path.join(__dirname, 'notebook', 'index.ts'), - ], - bundle: true, - minify: true, - sourcemap: false, - format: 'esm', - outdir: outDir, - platform: 'browser', - target: ['es2020'], - }); -} - - -build().catch(() => process.exit(1)); - -if (isWatch) { - const watcher = require('@parcel/watcher'); - watcher.subscribe(srcDir, () => { - return build(); - }); -} +require('../esbuild-webview-common').run({ + entryPoints: [ + path.join(srcDir, 'index.ts'), + ], + srcDir, + outdir: outDir, +}, process.argv); diff --git a/extensions/markdown-language-features/esbuild-preview.js b/extensions/markdown-language-features/esbuild-preview.js index c25dab4dbae..5a2e51cca09 100644 --- a/extensions/markdown-language-features/esbuild-preview.js +++ b/extensions/markdown-language-features/esbuild-preview.js @@ -4,42 +4,15 @@ *--------------------------------------------------------------------------------------------*/ // @ts-check const path = require('path'); -const esbuild = require('esbuild'); - -const args = process.argv.slice(2); - -const isWatch = args.indexOf('--watch') >= 0; - -let outputRoot = __dirname; -const outputRootIndex = args.indexOf('--outputRoot'); -if (outputRootIndex >= 0) { - outputRoot = args[outputRootIndex + 1]; -} const srcDir = path.join(__dirname, 'preview-src'); -const outDir = path.join(outputRoot, 'media'); +const outDir = path.join(__dirname, 'media'); -function build() { - return esbuild.build({ - entryPoints: [ - path.join(srcDir, 'index.ts'), - path.join(srcDir, 'pre'), - ], - bundle: true, - minify: true, - sourcemap: false, - format: 'iife', - outdir: outDir, - platform: 'browser', - target: ['es2020'], - }); -} - -build().catch(() => process.exit(1)); - -if (isWatch) { - const watcher = require('@parcel/watcher'); - watcher.subscribe(srcDir, () => { - return build(); - }); -} +require('../esbuild-webview-common').run({ + entryPoints: [ + path.join(srcDir, 'index.ts'), + path.join(srcDir, 'pre'), + ], + srcDir, + outdir: outDir, +}, process.argv); diff --git a/extensions/markdown-language-features/media/markdown.css b/extensions/markdown-language-features/media/markdown.css index ba08621a615..939eafc442b 100644 --- a/extensions/markdown-language-features/media/markdown.css +++ b/extensions/markdown-language-features/media/markdown.css @@ -21,9 +21,11 @@ p, ol, ul, pre { margin-top: 0; } -h2, h3, h4, h5, h6 { - font-weight: normal; - margin-bottom: 0.2em; +h1, h2, h3, h4, h5, h6 { + font-weight: 600; + margin-top: 24px; + margin-bottom: 16px; + line-height: 1.25; } #code-csp-warning { @@ -133,7 +135,7 @@ textarea:focus { } p { - margin-bottom: 0.7em; + margin-bottom: 16px; } ul, @@ -143,16 +145,39 @@ ol { hr { border: 0; - height: 2px; - border-bottom: 2px solid; + height: 1px; + border-bottom: 1px solid; } h1 { + font-size: 2em; + margin-top: 0; padding-bottom: 0.3em; - line-height: 1.2; border-bottom-width: 1px; border-bottom-style: solid; - font-weight: normal; +} + +h2 { + font-size: 1.5em; + padding-bottom: 0.3em; + border-bottom-width: 1px; + border-bottom-style: solid; +} + +h3 { + font-size: 1.25em; +} + +h4 { + font-size: 1em; +} + +h5 { + font-size: 0.875em; +} + +h6 { + font-size: 0.85em; } table { @@ -175,10 +200,11 @@ table > tbody > tr + tr > td { } blockquote { - margin: 0 7px 0 5px; - padding: 0 16px 0 10px; + margin: 0; + padding: 2px 16px 0 10px; border-left-width: 5px; border-left-style: solid; + border-radius: 2px; } code { @@ -207,6 +233,7 @@ pre code { pre { background-color: var(--vscode-textCodeBlock-background); + border: 1px solid var(--vscode-widget-border); } .vscode-high-contrast h1 { @@ -222,12 +249,14 @@ pre { } .vscode-light h1, +.vscode-light h2, .vscode-light hr, .vscode-light td { border-color: rgba(0, 0, 0, 0.18); } .vscode-dark h1, +.vscode-dark h2, .vscode-dark hr, .vscode-dark td { border-color: rgba(255, 255, 255, 0.18); diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json index 8240a451ea9..60e80b169d3 100644 --- a/extensions/markdown-language-features/package.json +++ b/extensions/markdown-language-features/package.json @@ -121,6 +121,10 @@ } ], "commands": [ + { + "command": "_markdown.copyImage", + "title": "%markdown.copyImage.title%" + }, { "command": "markdown.showPreview", "title": "%markdown.preview.title%", @@ -182,6 +186,12 @@ } ], "menus": { + "webview/context": [ + { + "command": "_markdown.copyImage", + "when": "webviewId == 'markdown.preview' && webviewSection == 'image'" + } + ], "editor/title": [ { "command": "markdown.showPreviewToSide", @@ -488,6 +498,22 @@ "%configuration.copyIntoWorkspace.never%" ] }, + "markdown.editor.pasteUrlAsFormattedLink.enabled": { + "type": "string", + "scope": "resource", + "markdownDescription": "%configuration.markdown.editor.pasteUrlAsFormattedLink.enabled%", + "default":"never", + "enum": [ + "always", + "smart", + "never" + ], + "markdownEnumDescriptions": [ + "%configuration.pasteUrlAsFormattedLink.always%", + "%configuration.pasteUrlAsFormattedLink.smart%", + "%configuration.pasteUrlAsFormattedLink.never%" + ] + }, "markdown.validate.enabled": { "type": "boolean", "scope": "resource", @@ -696,8 +722,8 @@ }, "dependencies": { "@vscode/extension-telemetry": "0.7.5", - "dompurify": "^2.4.1", - "highlight.js": "^11.4.0", + "dompurify": "^3.0.5", + "highlight.js": "^11.8.0", "markdown-it": "^12.3.2", "markdown-it-front-matter": "^0.2.1", "morphdom": "^2.6.1", @@ -706,7 +732,7 @@ "vscode-uri": "^3.0.3" }, "devDependencies": { - "@types/dompurify": "^2.3.1", + "@types/dompurify": "^3.0.2", "@types/lodash.throttle": "^4.1.3", "@types/markdown-it": "12.2.3", "@types/picomatch": "^2.3.0", diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json index 158dfdd0ac0..7336657621e 100644 --- a/extensions/markdown-language-features/package.nls.json +++ b/extensions/markdown-language-features/package.nls.json @@ -1,6 +1,7 @@ { "displayName": "Markdown Language Features", "description": "Provides rich language support for Markdown.", + "markdown.copyImage.title": "Copy Image", "markdown.preview.breaks.desc": "Sets how line-breaks are rendered in the Markdown preview. Setting it to 'true' creates a
for newlines inside paragraphs.", "markdown.preview.linkify": "Convert URL-like text to links in the Markdown preview.", "markdown.preview.typographer": "Enable some language-neutral replacement and quotes beautification in the Markdown preview.", @@ -42,6 +43,10 @@ "configuration.markdown.editor.filePaste.copyIntoWorkspace": "Controls if files outside of the workspace that are pasted into a Markdown editor should be copied into the workspace.\n\nUse `#markdown.copyFiles.destination#` to configure where copied files should be created.", "configuration.copyIntoWorkspace.mediaFiles": "Try to copy external image and video files into the workspace.", "configuration.copyIntoWorkspace.never": "Do not copy external files into the workspace.", + "configuration.markdown.editor.pasteUrlAsFormattedLink.enabled": "Controls how a Markdown link is created when a URL is pasted into the Markdown editor. Requires enabling `#editor.pasteAs.enabled#`.", + "configuration.pasteUrlAsFormattedLink.always": "Always creates a Markdown link when a URL is pasted into the Markdown editor.", + "configuration.pasteUrlAsFormattedLink.smart": "Smartly avoids creating a Markdown link in specific cases, such as within code brackets or inside an existing Markdown link.", + "configuration.pasteUrlAsFormattedLink.never": "Never creates a Markdown link when a URL is pasted into the Markdown editor.", "configuration.markdown.validate.enabled.description": "Enable all error reporting in Markdown files.", "configuration.markdown.validate.referenceLinks.enabled.description": "Validate reference links in Markdown files, for example: `[link][ref]`. Requires enabling `#markdown.validate.enabled#`.", "configuration.markdown.validate.fragmentLinks.enabled.description": "Validate fragment links to headers in the current Markdown file, for example: `[link](#header)`. Requires enabling `#markdown.validate.enabled#`.", @@ -58,7 +63,7 @@ "configuration.markdown.updateLinksOnFileMove.include.property": "The glob pattern to match file paths against. Set to true to enable the pattern.", "configuration.markdown.updateLinksOnFileMove.enableForDirectories": "Enable updating links when a directory is moved or renamed in the workspace.", "configuration.markdown.occurrencesHighlight.enabled": "Enable highlighting link occurrences in the current document.", - "configuration.markdown.copyFiles.destination": "Defines where files copied created by drop or paste should be created. This is a map from globs that match on the Markdown document to destinations.\n\nThe destinations may use the following variables:\n\n- `${documentFileName}` ā€” The full filename of the Markdown document, for example: `readme.md`.\n- `${documentBaseName}` ā€” The basename of Markdown document, for example: `readme`.\n- `${documentExtName}` ā€” The extension of the Markdown document, for example: `md`.\n- `${documentDirName}` ā€” The name of the Markdown document's parent directory.\n- `${documentWorkspaceFolder}` ā€” The workspace folder for the Markdown document, for example: `/Users/me/myProject`. This is the same as `${documentDirName}` if the file is not part of in a workspace.\n- `${fileName}` ā€” The file name of the dropped file, for example: `image.png`.", + "configuration.markdown.copyFiles.destination": "Defines where files copied created by drop or paste should be created. This is a map from globs that match on the Markdown document to destinations.\n\nThe destinations may use the following variables:\n\n- `${documentFileName}` ā€” The full filename of the Markdown document, for example: `readme.md`.\n- `${documentBaseName}` ā€” The basename of Markdown document, for example: `readme`.\n- `${documentExtName}` ā€” The extension of the Markdown document, for example: `md`.\n- `${documentDirName}` ā€” The name of the Markdown document's parent directory.\n- `${documentWorkspaceFolder}` ā€” The workspace folder for the Markdown document, for example: `/Users/me/myProject`. This is the same as `${documentDirName}` if the file is not part of a workspace.\n- `${fileName}` ā€” The file name of the dropped file, for example: `image.png`.", "configuration.markdown.copyFiles.overwriteBehavior": "Controls if files created by drop or paste should overwrite existing files.", "configuration.markdown.copyFiles.overwriteBehavior.nameIncrementally": "If a file with the same name already exists, append a number to the file name, for example: `image.png` becomes `image-1.png`.", "configuration.markdown.copyFiles.overwriteBehavior.overwrite": "If a file with the same name already exists, overwrite it.", diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts index 4b012c5eeb1..b54b09ef7c9 100644 --- a/extensions/markdown-language-features/preview-src/index.ts +++ b/extensions/markdown-language-features/preview-src/index.ts @@ -63,6 +63,7 @@ function doAfterImagesLoaded(cb: () => void) { onceDocumentLoaded(() => { const scrollProgress = state.scrollProgress; + addImageContexts(); if (typeof scrollProgress === 'number' && !settings.settings.fragment) { doAfterImagesLoaded(() => { scrollDisabledCount += 1; @@ -125,9 +126,58 @@ window.addEventListener('resize', () => { updateScrollProgress(); }, true); +function addImageContexts() { + const images = document.getElementsByTagName('img'); + let idNumber = 0; + for (const img of images) { + img.id = 'image-' + idNumber; + idNumber += 1; + img.setAttribute('data-vscode-context', JSON.stringify({ webviewSection: 'image', id: img.id, 'preventDefaultContextMenuItems': true, resource: documentResource })); + } +} + +async function copyImage(image: HTMLImageElement, retries = 5) { + if (!document.hasFocus() && retries > 0) { + // copyImage is called at the same time as webview.reveal, which means this function is running whilst the webview is gaining focus. + // Since navigator.clipboard.write requires the document to be focused, we need to wait for focus. + // We cannot use a listener, as there is a high chance the focus is gained during the setup of the listener resulting in us missing it. + setTimeout(() => { copyImage(image, retries - 1); }, 20); + return; + } + + try { + await navigator.clipboard.write([new ClipboardItem({ + 'image/png': new Promise((resolve) => { + const canvas = document.createElement('canvas'); + if (canvas !== null) { + canvas.width = image.naturalWidth; + canvas.height = image.naturalHeight; + const context = canvas.getContext('2d'); + context?.drawImage(image, 0, 0); + } + canvas.toBlob((blob) => { + if (blob) { + resolve(blob); + } + canvas.remove(); + }, 'image/png'); + }) + })]); + } catch (e) { + console.error(e); + } +} + window.addEventListener('message', async event => { const data = event.data as ToWebviewMessage.Type; switch (data.type) { + case 'copyImage': { + const img = document.getElementById(data.id); + if (img instanceof HTMLImageElement) { + copyImage(img); + } + return; + } case 'onDidChangeTextEditorSelection': if (data.source === documentResource) { marker.onDidChangeTextEditorSelection(data.line, documentVersion); @@ -144,7 +194,7 @@ window.addEventListener('message', async event => { const root = document.querySelector('.markdown-body')!; const parser = new DOMParser(); - const newContent = parser.parseFromString(data.content, 'text/html'); + const newContent = parser.parseFromString(data.content, 'text/html'); // CodeQL [SM03712] This renderers content from the workspace into the Markdown preview. Webviews (and the markdown preview) have many other security measures in place to make this safe // Strip out meta http-equiv tags for (const metaElement of Array.from(newContent.querySelectorAll('meta'))) { @@ -239,6 +289,7 @@ window.addEventListener('message', async event => { ++documentVersion; window.dispatchEvent(new CustomEvent('vscode.markdown.updateContent')); + addImageContexts(); break; } } diff --git a/extensions/markdown-language-features/server/CHANGELOG.md b/extensions/markdown-language-features/server/CHANGELOG.md index 98ac9c98688..a5cc9d15cf1 100644 --- a/extensions/markdown-language-features/server/CHANGELOG.md +++ b/extensions/markdown-language-features/server/CHANGELOG.md @@ -1,2 +1,7 @@ -# 0.3.0 - March 28, 2023 +# Changelog + +# 0.4.0-alpha.3 ā€” June 2, 2023 +- Pick up [Markdown Language Service](https://github.com/microsoft/vscode-markdown-languageservice) 0.4.0-alpha.3. See [CHANGELOG](https://github.com/microsoft/vscode-markdown-languageservice/blob/main/CHANGELOG.md#040-alpha3--may-30-2023) for details. + +## 0.3.0 - March 28, 2023 - Pick up [Markdown Language Service](https://github.com/microsoft/vscode-markdown-languageservice) 0.3.0. See [CHANGELOG](https://github.com/microsoft/vscode-markdown-languageservice/blob/main/CHANGELOG.md#030--march-16-2023) for details. diff --git a/extensions/markdown-language-features/server/package.json b/extensions/markdown-language-features/server/package.json index 6a101879701..87ddad6aef1 100644 --- a/extensions/markdown-language-features/server/package.json +++ b/extensions/markdown-language-features/server/package.json @@ -1,7 +1,7 @@ { "name": "vscode-markdown-languageserver", "description": "Markdown language server", - "version": "0.4.0-alpha.1", + "version": "0.4.0-alpha.5", "author": "Microsoft Corporation", "license": "MIT", "engines": { @@ -18,7 +18,7 @@ "vscode-languageserver": "^8.1.0", "vscode-languageserver-textdocument": "^1.0.8", "vscode-languageserver-types": "^3.17.3", - "vscode-markdown-languageservice": "^0.4.0-alpha.1", + "vscode-markdown-languageservice": "^0.4.0-alpha.5", "vscode-uri": "^3.0.7" }, "devDependencies": { diff --git a/extensions/markdown-language-features/server/yarn.lock b/extensions/markdown-language-features/server/yarn.lock index 1a47c2a1746..6c6560ec7ea 100644 --- a/extensions/markdown-language-features/server/yarn.lock +++ b/extensions/markdown-language-features/server/yarn.lock @@ -128,10 +128,10 @@ vscode-languageserver@^8.1.0: dependencies: vscode-languageserver-protocol "3.17.3" -vscode-markdown-languageservice@^0.4.0-alpha.1: - version "0.4.0-alpha.1" - resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.4.0-alpha.1.tgz#367582d711a95001adb1cfae2eb8c9852cc51319" - integrity sha512-MqNHwKaO5UliiJ2lNSt8FRj/68max/7/N4JwD0mLkx/NAWLXYLluBbE1CQh/Fgycpcueldk0cckKYj/qNWDtVA== +vscode-markdown-languageservice@^0.4.0-alpha.5: + version "0.4.0-alpha.5" + resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.4.0-alpha.5.tgz#5a50dab354d07a4fb93b16cea43968f7a578c2b9" + integrity sha512-Pf183mpyAQ5WlsqXKlzSzPUACRlXxcEFGpn+vYsAx5m7r26hqtBTYHpTKzidIPqh6Xy797VGbtrOkvuwBmcCTg== dependencies: "@vscode/l10n" "^0.0.10" node-html-parser "^6.1.5" diff --git a/extensions/markdown-language-features/src/commands/copyImage.ts b/extensions/markdown-language-features/src/commands/copyImage.ts new file mode 100644 index 00000000000..86fd349c730 --- /dev/null +++ b/extensions/markdown-language-features/src/commands/copyImage.ts @@ -0,0 +1,21 @@ +/*--------------------------------------------------------------------------------------------- + * 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 { Command } from '../commandManager'; +import { MarkdownPreviewManager } from '../preview/previewManager'; + +export class CopyImageCommand implements Command { + public readonly id = '_markdown.copyImage'; + + public constructor( + private readonly _webviewManager: MarkdownPreviewManager, + ) { } + + public execute(args: { id: string; resource: string }) { + const source = vscode.Uri.parse(args.resource); + this._webviewManager.findPreview(source)?.copyImage(args.id); + } +} diff --git a/extensions/markdown-language-features/src/commands/index.ts b/extensions/markdown-language-features/src/commands/index.ts index 8904d4a547c..e1a4f2b41ff 100644 --- a/extensions/markdown-language-features/src/commands/index.ts +++ b/extensions/markdown-language-features/src/commands/index.ts @@ -14,6 +14,7 @@ import { RefreshPreviewCommand } from './refreshPreview'; import { ReloadPlugins } from './reloadPlugins'; import { RenderDocument } from './renderDocument'; import { ShowLockedPreviewToSideCommand, ShowPreviewCommand, ShowPreviewToSideCommand } from './showPreview'; +import { CopyImageCommand } from './copyImage'; import { ShowPreviewSecuritySelectorCommand } from './showPreviewSecuritySelector'; import { ShowSourceCommand } from './showSource'; import { ToggleLockCommand } from './toggleLock'; @@ -27,6 +28,7 @@ export function registerMarkdownCommands( ): vscode.Disposable { const previewSecuritySelector = new PreviewSecuritySelector(cspArbiter, previewManager); + commandManager.register(new CopyImageCommand(previewManager)); commandManager.register(new ShowPreviewCommand(previewManager, telemetryReporter)); commandManager.register(new ShowPreviewToSideCommand(previewManager, telemetryReporter)); commandManager.register(new ShowLockedPreviewToSideCommand(previewManager, telemetryReporter)); diff --git a/extensions/markdown-language-features/src/commands/insertResource.ts b/extensions/markdown-language-features/src/commands/insertResource.ts index f5d0cf8fe13..87de74270ca 100644 --- a/extensions/markdown-language-features/src/commands/insertResource.ts +++ b/extensions/markdown-language-features/src/commands/insertResource.ts @@ -60,7 +60,7 @@ export class InsertImageFromWorkspace implements Command { } function getDefaultUri(document: vscode.TextDocument) { - const docUri = getParentDocumentUri(document); + const docUri = getParentDocumentUri(document.uri); if (docUri.scheme === Schemes.untitled) { return vscode.workspace.workspaceFolders?.[0]?.uri; } @@ -76,10 +76,10 @@ async function insertLink(activeEditor: vscode.TextEditor, selectedFiles: vscode await vscode.workspace.applyEdit(edit); } -function createInsertLinkEdit(activeEditor: vscode.TextEditor, selectedFiles: vscode.Uri[], insertAsMedia: boolean) { +function createInsertLinkEdit(activeEditor: vscode.TextEditor, selectedFiles: vscode.Uri[], insertAsMedia: boolean, title = '', placeholderValue = 0, pasteAsMarkdownLink = true, isExternalLink = false) { const snippetEdits = coalesce(activeEditor.selections.map((selection, i): vscode.SnippetTextEdit | undefined => { const selectionText = activeEditor.document.getText(selection); - const snippet = createUriListSnippet(activeEditor.document, selectedFiles, { + const snippet = createUriListSnippet(activeEditor.document, selectedFiles, [], title, placeholderValue, pasteAsMarkdownLink, isExternalLink, { insertAsMedia, placeholderText: selectionText, placeholderStartIndex: (i + 1) * selectedFiles.length, diff --git a/extensions/markdown-language-features/src/extension.shared.ts b/extensions/markdown-language-features/src/extension.shared.ts index ce709783d0b..79242573136 100644 --- a/extensions/markdown-language-features/src/extension.shared.ts +++ b/extensions/markdown-language-features/src/extension.shared.ts @@ -8,6 +8,7 @@ import { MdLanguageClient } from './client/client'; import { CommandManager } from './commandManager'; import { registerMarkdownCommands } from './commands/index'; import { registerPasteSupport } from './languageFeatures/copyFiles/copyPaste'; +import { registerLinkPasteSupport } from './languageFeatures/copyFiles/copyPasteLinks'; import { registerDiagnosticSupport } from './languageFeatures/diagnostics'; import { registerDropIntoEditorSupport } from './languageFeatures/copyFiles/dropIntoEditor'; import { registerFindFileReferenceSupport } from './languageFeatures/fileReferences'; @@ -59,6 +60,7 @@ function registerMarkdownLanguageFeatures( registerDropIntoEditorSupport(selector), registerFindFileReferenceSupport(commandManager, client), registerPasteSupport(selector), + registerLinkPasteSupport(selector), registerUpdateLinksOnRename(client), ); } diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyFiles.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyFiles.ts index 280aa541e15..c8f44fad2bc 100644 --- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyFiles.ts +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyFiles.ts @@ -2,7 +2,6 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'path'; import * as picomatch from 'picomatch'; import * as vscode from 'vscode'; import { Utils } from 'vscode-uri'; @@ -43,8 +42,9 @@ export class NewFilePathGenerator { const desiredPath = getDesiredNewFilePath(config, document, file); const root = Utils.dirname(desiredPath); - const ext = path.extname(file.name); - const baseName = path.basename(file.name, ext); + const ext = Utils.extname(desiredPath); + let baseName = Utils.basename(desiredPath); + baseName = baseName.slice(0, baseName.length - ext.length); for (let i = 0; ; ++i) { if (token.isCancellationRequested) { return undefined; @@ -81,10 +81,10 @@ export class NewFilePathGenerator { } function getDesiredNewFilePath(config: CopyFileConfiguration, document: vscode.TextDocument, file: vscode.DataTransferFile): vscode.Uri { - const docUri = getParentDocumentUri(document); + const docUri = getParentDocumentUri(document.uri); for (const [rawGlob, rawDest] of Object.entries(config.destination)) { for (const glob of parseGlob(rawGlob)) { - if (picomatch.isMatch(docUri.path, glob)) { + if (picomatch.isMatch(docUri.path, glob, { dot: true })) { return resolveCopyDestination(docUri, file.name, rawDest, uri => vscode.workspace.getWorkspaceFolder(uri)?.uri); } } @@ -125,7 +125,10 @@ export function resolveCopyDestination(documentUri: vscode.Uri, fileName: string function resolveCopyDestinationSetting(documentUri: vscode.Uri, fileName: string, dest: string, getWorkspaceFolder: GetWorkspaceFolder): string { - let outDest = dest; + let outDest = dest.trim(); + if (!outDest) { + outDest = '${fileName}'; + } // Destination that start with `/` implicitly means go to workspace root if (outDest.startsWith('/')) { diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyPaste.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyPaste.ts index ed6d99bd973..727216c02bc 100644 --- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyPaste.ts +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyPaste.ts @@ -5,7 +5,7 @@ import * as vscode from 'vscode'; import { Schemes } from '../../util/schemes'; -import { createEditForMediaFiles, mediaMimes, tryGetUriListSnippet } from './shared'; +import { createEditForMediaFiles, createEditAddingLinksForUriList, mediaMimes, getPasteUrlAsFormattedLinkSetting, PasteUrlAsFormattedLink } from './shared'; class PasteEditProvider implements vscode.DocumentPasteEditProvider { @@ -13,7 +13,7 @@ class PasteEditProvider implements vscode.DocumentPasteEditProvider { async provideDocumentPasteEdits( document: vscode.TextDocument, - _ranges: readonly vscode.Range[], + ranges: readonly vscode.Range[], dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken, ): Promise { @@ -27,12 +27,19 @@ class PasteEditProvider implements vscode.DocumentPasteEditProvider { return createEdit; } - const snippet = await tryGetUriListSnippet(document, dataTransfer, token); - if (!snippet) { + const uriEdit = new vscode.DocumentPasteEdit('', this._id, ''); + const urlList = await dataTransfer.get('text/uri-list')?.asString(); + if (!urlList) { + return; + } + const pasteUrlSetting = await getPasteUrlAsFormattedLinkSetting(document); + const pasteEdit = await createEditAddingLinksForUriList(document, ranges, urlList, false, pasteUrlSetting === PasteUrlAsFormattedLink.Smart, token); + if (!pasteEdit) { return; } - const uriEdit = new vscode.DocumentPasteEdit(snippet.snippet, this._id, snippet.label); + uriEdit.label = pasteEdit.label; + uriEdit.additionalEdit = pasteEdit.additionalEdits; uriEdit.priority = this._getPriority(dataTransfer); return uriEdit; } diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyPasteLinks.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyPasteLinks.ts new file mode 100644 index 00000000000..625588529e4 --- /dev/null +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyPasteLinks.ts @@ -0,0 +1,64 @@ +/*--------------------------------------------------------------------------------------------- + * 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 { createEditAddingLinksForUriList, getPasteUrlAsFormattedLinkSetting, PasteUrlAsFormattedLink, validateLink } from './shared'; +class PasteLinkEditProvider implements vscode.DocumentPasteEditProvider { + + readonly id = 'insertMarkdownLink'; + async provideDocumentPasteEdits( + document: vscode.TextDocument, + ranges: readonly vscode.Range[], + dataTransfer: vscode.DataTransfer, + token: vscode.CancellationToken, + ): Promise { + const pasteUrlSetting = await getPasteUrlAsFormattedLinkSetting(document); + if (pasteUrlSetting === PasteUrlAsFormattedLink.Never) { + return; + } + + const item = dataTransfer.get('text/plain'); + const urlList = await item?.asString(); + + if (urlList === undefined) { + return; + } + + if (!validateLink(urlList).isValid) { + return; + } + + const uriEdit = new vscode.DocumentPasteEdit('', this.id, ''); + if (!urlList) { + return undefined; + } + + const pasteEdit = await createEditAddingLinksForUriList(document, ranges, validateLink(urlList).cleanedUrlList, true, pasteUrlSetting === PasteUrlAsFormattedLink.Smart, token); + if (!pasteEdit) { + return; + } + + uriEdit.label = pasteEdit.label; + uriEdit.additionalEdit = pasteEdit.additionalEdits; + uriEdit.priority = this._getPriority(pasteEdit.markdownLink); + return uriEdit; + } + + private _getPriority(pasteAsMarkdownLink: boolean): number { + if (!pasteAsMarkdownLink) { + // Deprioritize in favor of default paste + return -10; + } + return 0; + } +} + +export function registerLinkPasteSupport(selector: vscode.DocumentSelector,) { + return vscode.languages.registerDocumentPasteEditProvider(selector, new PasteLinkEditProvider(), { + pasteMimeTypes: [ + 'text/plain', + ] + }); +} diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropIntoEditor.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropIntoEditor.ts index cc88a8c9996..95c8455e307 100644 --- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropIntoEditor.ts +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropIntoEditor.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { createEditForMediaFiles as createEditForMediaFiles, tryGetUriListSnippet } from './shared'; +import { createEditForMediaFiles as createEditForMediaFiles, mediaMimes, tryGetUriListSnippet } from './shared'; import { Schemes } from '../../util/schemes'; @@ -30,7 +30,11 @@ class MarkdownImageDropProvider implements vscode.DocumentDropEditProvider { } private async _getUriListEdit(document: vscode.TextDocument, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise { - const snippet = await tryGetUriListSnippet(document, dataTransfer, token); + const urlList = await dataTransfer.get('text/uri-list')?.asString(); + if (!urlList) { + return undefined; + } + const snippet = await tryGetUriListSnippet(document, urlList, token); if (!snippet) { return undefined; } @@ -67,7 +71,8 @@ class MarkdownImageDropProvider implements vscode.DocumentDropEditProvider { export function registerDropIntoEditorSupport(selector: vscode.DocumentSelector) { return vscode.languages.registerDocumentDropEditProvider(selector, new MarkdownImageDropProvider(), { dropMimeTypes: [ - 'text/uri-list' + 'text/uri-list', + ...mediaMimes, ] }); } diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts index 3892941b7ce..2a368f233d9 100644 --- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts @@ -14,8 +14,15 @@ import { getDocumentDir } from '../../util/document'; enum MediaKind { Image, Video, + Audio, } +export const externalUriSchemes = [ + 'http', + 'https', + 'mailto', +]; + export const mediaFileExtensions = new Map([ // Images ['bmp', MediaKind.Image], @@ -35,6 +42,11 @@ export const mediaFileExtensions = new Map([ // Videos ['ogg', MediaKind.Video], ['mp4', MediaKind.Video], + + // Audio Files + ['mp3', MediaKind.Audio], + ['aac', MediaKind.Audio], + ['wav', MediaKind.Audio], ]); export const mediaMimes = new Set([ @@ -45,25 +57,134 @@ export const mediaMimes = new Set([ 'image/webp', 'video/mp4', 'video/ogg', + 'audio/mpeg', + 'audio/aac', + 'audio/x-wav', ]); +const smartPasteRegexes = [ + { regex: /(\[[^\[\]]*](?:\([^\(\)]*\)|\[[^\[\]]*]))/g }, // In a Markdown link + { regex: /^```[\s\S]*?```$/gm }, // In a backtick fenced code block + { regex: /^~~~[\s\S]*?~~~$/gm }, // In a tildefenced code block + { regex: /^\$\$[\s\S]*?\$\$$/gm }, // In a fenced math block + { regex: /`[^`]*`/g }, // In inline code + { regex: /\$[^$]*\$/g }, // In inline math +]; -export async function tryGetUriListSnippet(document: vscode.TextDocument, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise<{ snippet: vscode.SnippetString; label: string } | undefined> { - const urlList = await dataTransfer.get('text/uri-list')?.asString(); - if (!urlList || token.isCancellationRequested) { - return undefined; +export interface SkinnyTextDocument { + offsetAt(position: vscode.Position): number; + getText(range?: vscode.Range): string; + readonly uri: vscode.Uri; +} + +export enum PasteUrlAsFormattedLink { + Always = 'always', + Smart = 'smart', + Never = 'never' +} + +export async function getPasteUrlAsFormattedLinkSetting(document: vscode.TextDocument): Promise { + return vscode.workspace.getConfiguration('markdown', document).get('editor.pasteUrlAsFormattedLink.enabled', PasteUrlAsFormattedLink.Smart); +} + +export async function createEditAddingLinksForUriList( + document: SkinnyTextDocument, + ranges: readonly vscode.Range[], + urlList: string, + isExternalLink: boolean, + useSmartPaste: boolean, + token: vscode.CancellationToken, +): Promise<{ additionalEdits: vscode.WorkspaceEdit; label: string; markdownLink: boolean } | undefined> { + + if (ranges.length === 0) { + return; + } + const edits: vscode.SnippetTextEdit[] = []; + let placeHolderValue: number = ranges.length; + let label: string = ''; + let pasteAsMarkdownLink: boolean = true; + let markdownLink: boolean = true; + + for (const range of ranges) { + const selectedRange: vscode.Range = new vscode.Range( + new vscode.Position(range.start.line, document.offsetAt(range.start)), + new vscode.Position(range.end.line, document.offsetAt(range.end)) + ); + + if (useSmartPaste) { + pasteAsMarkdownLink = checkSmartPaste(document, selectedRange, range); + markdownLink = pasteAsMarkdownLink; // FIX: this will only match the last range + } + + const snippet = await tryGetUriListSnippet(document, urlList, token, document.getText(range), placeHolderValue, pasteAsMarkdownLink, isExternalLink); + if (!snippet) { + return; + } + + pasteAsMarkdownLink = true; + placeHolderValue--; + edits.push(new vscode.SnippetTextEdit(range, snippet.snippet)); + label = snippet.label; } + const additionalEdits = new vscode.WorkspaceEdit(); + additionalEdits.set(document.uri, edits); + + return { additionalEdits, label, markdownLink }; +} + +export function checkSmartPaste(document: SkinnyTextDocument, selectedRange: vscode.Range, range: vscode.Range): boolean { + if (selectedRange.isEmpty || /^[\s\n]*$/.test(document.getText(range)) || validateLink(document.getText(range)).isValid) { + return false; + } + if (/\[.*\]\(.*\)/.test(document.getText(range)) || /!\[.*\]\(.*\)/.test(document.getText(range))) { + return false; + } + for (const regex of smartPasteRegexes) { + const matches = [...document.getText().matchAll(regex.regex)]; + for (const match of matches) { + if (match.index !== undefined) { + const useDefaultPaste = selectedRange.start.character > match.index && selectedRange.end.character < match.index + match[0].length; + if (useDefaultPaste) { + return false; + } + } + } + } + return true; +} + +export function validateLink(urlList: string): { isValid: boolean; cleanedUrlList: string } { + let isValid = false; + let uri = undefined; + const trimmedUrlList = urlList?.trim(); //remove leading and trailing whitespace and new lines + try { + uri = vscode.Uri.parse(trimmedUrlList); + } catch (error) { + return { isValid: false, cleanedUrlList: urlList }; + } + const splitUrlList = trimmedUrlList.split(' ').filter(item => item !== ''); //split on spaces and remove empty strings + if (uri) { + isValid = splitUrlList.length === 1 && !splitUrlList[0].includes('\n') && externalUriSchemes.includes(vscode.Uri.parse(splitUrlList[0]).scheme) && !!vscode.Uri.parse(splitUrlList[0]).authority; + } + return { isValid, cleanedUrlList: splitUrlList[0] }; +} + +export async function tryGetUriListSnippet(document: SkinnyTextDocument, urlList: String, token: vscode.CancellationToken, title = '', placeHolderValue = 0, pasteAsMarkdownLink = true, isExternalLink = false): Promise<{ snippet: vscode.SnippetString; label: string } | undefined> { + if (token.isCancellationRequested) { + return undefined; + } + const uriStrings: string[] = []; const uris: vscode.Uri[] = []; for (const resource of urlList.split(/\r?\n/g)) { try { uris.push(vscode.Uri.parse(resource)); + uriStrings.push(resource); } catch { // noop } } - - return createUriListSnippet(document, uris); + return createUriListSnippet(document, uris, uriStrings, title, placeHolderValue, pasteAsMarkdownLink, isExternalLink); } interface UriListSnippetOptions { @@ -81,49 +202,78 @@ interface UriListSnippetOptions { readonly separator?: string; } +export function appendToLinkSnippet( + snippet: vscode.SnippetString, + title: string, + uriString: string, + placeholderValue: number, + isExternalLink: boolean, +): vscode.SnippetString { + snippet.appendText('['); + snippet.appendPlaceholder(escapeBrackets(title) || 'Title', placeholderValue); + snippet.appendText(`](${escapeMarkdownLinkPath(uriString, isExternalLink)})`); + return snippet; +} export function createUriListSnippet( - document: vscode.TextDocument, + document: SkinnyTextDocument, uris: readonly vscode.Uri[], - options?: UriListSnippetOptions + uriStrings?: readonly string[], + title = '', + placeholderValue = 0, + pasteAsMarkdownLink = true, + isExternalLink = false, + options?: UriListSnippetOptions, ): { snippet: vscode.SnippetString; label: string } | undefined { if (!uris.length) { return; } - const dir = getDocumentDir(document); - - const snippet = new vscode.SnippetString(); + const documentDir = getDocumentDir(document.uri); + let snippet = new vscode.SnippetString(); let insertedLinkCount = 0; let insertedImageCount = 0; + let insertedAudioVideoCount = 0; uris.forEach((uri, i) => { - const mdPath = getMdPath(dir, uri); + const mdPath = getMdPath(documentDir, uri); const ext = URI.Utils.extname(uri).toLowerCase().replace('.', ''); const insertAsMedia = typeof options?.insertAsMedia === 'undefined' ? mediaFileExtensions.has(ext) : !!options.insertAsMedia; const insertAsVideo = mediaFileExtensions.get(ext) === MediaKind.Video; + const insertAsAudio = mediaFileExtensions.get(ext) === MediaKind.Audio; if (insertAsVideo) { - insertedImageCount++; - snippet.appendText(`'); - } else { + } else if (insertAsAudio) { + insertedAudioVideoCount++; + snippet.appendText(`'); + } else if (insertAsMedia) { if (insertAsMedia) { insertedImageCount++; + if (pasteAsMarkdownLink) { + snippet.appendText('!['); + const placeholderText = escapeBrackets(title) || options?.placeholderText || 'Alt text'; + const placeholderIndex = typeof options?.placeholderStartIndex !== 'undefined' ? options?.placeholderStartIndex + i : (placeholderValue === 0 ? undefined : placeholderValue); + snippet.appendPlaceholder(placeholderText, placeholderIndex); + snippet.appendText(`](${escapeMarkdownLinkPath(mdPath, isExternalLink)})`); + } else { + snippet.appendText(escapeMarkdownLinkPath(mdPath, isExternalLink)); + } + } + } else { + insertedLinkCount++; + if (uriStrings && isExternalLink) { + snippet = appendToLinkSnippet(snippet, title, uriStrings[i], placeholderValue, isExternalLink); } else { - insertedLinkCount++; + snippet.appendText(escapeMarkdownLinkPath(mdPath, isExternalLink)); } - - snippet.appendText(insertAsMedia ? '![' : '['); - - const placeholderText = options?.placeholderText ?? (insertAsMedia ? 'Alt text' : 'label'); - const placeholderIndex = typeof options?.placeholderStartIndex !== 'undefined' ? options?.placeholderStartIndex + i : undefined; - snippet.appendPlaceholder(placeholderText, placeholderIndex); - - snippet.appendText(`](${mdPath})`); } if (i < uris.length - 1 && uris.length > 1) { @@ -132,7 +282,13 @@ export function createUriListSnippet( }); let label: string; - if (insertedImageCount > 0 && insertedLinkCount > 0) { + if (insertedAudioVideoCount > 0) { + if (insertedLinkCount > 0) { + label = vscode.l10n.t('Insert Markdown Media and Links'); + } else { + label = vscode.l10n.t('Insert Markdown Media'); + } + } else if (insertedImageCount > 0 && insertedLinkCount > 0) { label = vscode.l10n.t('Insert Markdown Images and Links'); } else if (insertedImageCount > 0) { label = insertedImageCount > 1 @@ -224,11 +380,58 @@ function getMdPath(dir: vscode.Uri | undefined, file: vscode.Uri) { // so that drive-letters are resolved cast insensitively. However we then want to // convert back to a posix path to insert in to the document. const relativePath = path.relative(dir.fsPath, file.fsPath); - return encodeURI(path.posix.normalize(relativePath.split(path.sep).join(path.posix.sep))); + return path.posix.normalize(relativePath.split(path.sep).join(path.posix.sep)); } - return encodeURI(path.posix.relative(dir.path, file.path)); + return path.posix.relative(dir.path, file.path); } return file.toString(false); } + +function escapeHtmlAttribute(attr: string): string { + return encodeURI(attr).replaceAll('"', '"'); +} + +function escapeMarkdownLinkPath(mdPath: string, isExternalLink: boolean): string { + if (needsBracketLink(mdPath)) { + return '<' + mdPath.replaceAll('<', '\\<').replaceAll('>', '\\>') + '>'; + } + + return isExternalLink ? mdPath : encodeURI(mdPath); +} + +function escapeBrackets(value: string): string { + value = value.replace(/[\[\]]/g, '\\$&'); + return value; +} + +function needsBracketLink(mdPath: string) { + // Links with whitespace or control characters must be enclosed in brackets + if (mdPath.startsWith('<') || /\s|[\u007F\u0000-\u001f]/.test(mdPath)) { + return true; + } + + // Check if the link has mis-matched parens + if (!/[\(\)]/.test(mdPath)) { + return false; + } + + let previousChar = ''; + let nestingCount = 0; + for (const char of mdPath) { + if (char === '(' && previousChar !== '\\') { + nestingCount++; + } else if (char === ')' && previousChar !== '\\') { + nestingCount--; + } + + if (nestingCount < 0) { + return true; + } + previousChar = char; + } + + return nestingCount > 0; +} + diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts index 282cef1548d..cd999c44116 100644 --- a/extensions/markdown-language-features/src/markdownEngine.ts +++ b/extensions/markdown-language-features/src/markdownEngine.ts @@ -114,6 +114,7 @@ export class MarkdownItEngine implements IMdParser { _contributionProvider.onContributionsChanged(() => { // Markdown plugin contributions may have changed this._md = undefined; + this._tokenCache.clean(); }); } diff --git a/extensions/markdown-language-features/src/preview/preview.ts b/extensions/markdown-language-features/src/preview/preview.ts index 828442a76e5..7ccbc625b47 100644 --- a/extensions/markdown-language-features/src/preview/preview.ts +++ b/extensions/markdown-language-features/src/preview/preview.ts @@ -95,7 +95,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider { } this._register(_contributionProvider.onContributionsChanged(() => { - setTimeout(() => this.refresh(), 0); + setTimeout(() => this.refresh(true), 0); })); this._register(vscode.workspace.onDidChangeTextDocument(event => { @@ -442,8 +442,8 @@ export interface IManagedMarkdownPreview { readonly onDispose: vscode.Event; readonly onDidChangeViewState: vscode.Event; + copyImage(id: string): void; dispose(): void; - refresh(): void; updateConfiguration(): void; @@ -515,6 +515,15 @@ export class StaticMarkdownPreview extends Disposable implements IManagedMarkdow })); } + copyImage(id: string) { + this._webviewPanel.reveal(); + this._preview.postMessage({ + type: 'copyImage', + source: this.resource.toString(), + id: id + }); + } + private readonly _onDispose = this._register(new vscode.EventEmitter()); public readonly onDispose = this._onDispose.event; @@ -661,6 +670,15 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo })); } + copyImage(id: string) { + this._webviewPanel.reveal(); + this._preview.postMessage({ + type: 'copyImage', + source: this.resource.toString(), + id: id + }); + } + private readonly _onDisposeEmitter = this._register(new vscode.EventEmitter()); public readonly onDispose = this._onDisposeEmitter.event; diff --git a/extensions/markdown-language-features/src/preview/previewManager.ts b/extensions/markdown-language-features/src/preview/previewManager.ts index 7f6de5023b3..3b46c2a4322 100644 --- a/extensions/markdown-language-features/src/preview/previewManager.ts +++ b/extensions/markdown-language-features/src/preview/previewManager.ts @@ -147,6 +147,15 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview return this._activePreview?.resourceColumn; } + public findPreview(resource: vscode.Uri): IManagedMarkdownPreview | undefined { + for (const preview of [...this._dynamicPreviews, ...this._staticPreviews]) { + if (preview.resource.fsPath === resource.fsPath) { + return preview; + } + } + return undefined; + } + public toggleLock() { const preview = this._activePreview; if (preview instanceof DynamicMarkdownPreview) { diff --git a/extensions/markdown-language-features/src/test/markdownLink.test.ts b/extensions/markdown-language-features/src/test/markdownLink.test.ts new file mode 100644 index 00000000000..f0133ad85cc --- /dev/null +++ b/extensions/markdown-language-features/src/test/markdownLink.test.ts @@ -0,0 +1,233 @@ +/*--------------------------------------------------------------------------------------------- + * 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 * as assert from 'assert'; +import 'mocha'; +import { SkinnyTextDocument, checkSmartPaste, createEditAddingLinksForUriList, appendToLinkSnippet, validateLink } from '../languageFeatures/copyFiles/shared'; + +suite('createEditAddingLinksForUriList', () => { + + test('Markdown Link Pasting should occur for a valid link (end to end)', async () => { + // createEditAddingLinksForUriList -> checkSmartPaste -> tryGetUriListSnippet -> createUriListSnippet -> createLinkSnippet + + const skinnyDocument: SkinnyTextDocument = { + uri: vscode.Uri.parse('file:///path/to/your/file'), + offsetAt: function () { return 0; }, + getText: function () { return 'hello world!'; }, + }; + + const result = await createEditAddingLinksForUriList(skinnyDocument, [new vscode.Range(0, 0, 0, 12)], 'https://www.microsoft.com/', true, true, new vscode.CancellationTokenSource().token); + // need to check the actual result -> snippet value + assert.strictEqual(result?.label, 'Insert Markdown Link'); + }); + + suite('validateLink', () => { + + test('Markdown pasting should occur for a valid link.', () => { + const isLink = validateLink('https://www.microsoft.com/').isValid; + assert.strictEqual(isLink, true); + }); + + test('Markdown pasting should occur for a valid link preceded by a new line.', () => { + const isLink = validateLink('\r\nhttps://www.microsoft.com/').isValid; + assert.strictEqual(isLink, true); + }); + + test('Markdown pasting should occur for a valid link followed by a new line.', () => { + const isLink = validateLink('https://www.microsoft.com/\r\n').isValid; + assert.strictEqual(isLink, true); + }); + + test('Markdown pasting should not occur for a valid hostname and invalid protool.', () => { + const isLink = validateLink('invalid:www.microsoft.com').isValid; + assert.strictEqual(isLink, false); + }); + + test('Markdown pasting should not occur for plain text.', () => { + const isLink = validateLink('hello world!').isValid; + assert.strictEqual(isLink, false); + }); + + test('Markdown pasting should not occur for plain text including a colon.', () => { + const isLink = validateLink('hello: world!').isValid; + assert.strictEqual(isLink, false); + }); + + test('Markdown pasting should not occur for plain text including a slashes.', () => { + const isLink = validateLink('helloworld!').isValid; + assert.strictEqual(isLink, false); + }); + + test('Markdown pasting should not occur for a link followed by text.', () => { + const isLink = validateLink('https://www.microsoft.com/ hello world!').isValid; + assert.strictEqual(isLink, false); + }); + + test('Markdown pasting should occur for a link preceded or followed by spaces.', () => { + const isLink = validateLink(' https://www.microsoft.com/ ').isValid; + assert.strictEqual(isLink, true); + }); + + test('Markdown pasting should not occur for a link with an invalid scheme.', () => { + const isLink = validateLink('hello:www.microsoft.com').isValid; + assert.strictEqual(isLink, false); + }); + + test('Markdown pasting should not occur for multiple links being pasted.', () => { + const isLink = validateLink('https://www.microsoft.com/\r\nhttps://www.microsoft.com/\r\nhttps://www.microsoft.com/\r\nhttps://www.microsoft.com/').isValid; + assert.strictEqual(isLink, false); + }); + + test('Markdown pasting should not occur for multiple links with spaces being pasted.', () => { + const isLink = validateLink('https://www.microsoft.com/ \r\nhttps://www.microsoft.com/\r\nhttps://www.microsoft.com/\r\n hello \r\nhttps://www.microsoft.com/').isValid; + assert.strictEqual(isLink, false); + }); + + test('Markdown pasting should not occur for just a valid uri scheme', () => { + const isLink = validateLink('https://').isValid; + assert.strictEqual(isLink, false); + }); + }); + + suite('appendToLinkSnippet', () => { + + test('Should create snippet with < > when pasted link has an mismatched parentheses', () => { + const uriString = 'https://www.mic(rosoft.com'; + const snippet = appendToLinkSnippet(new vscode.SnippetString(''), 'abc', uriString, 0, true); + assert.strictEqual(snippet?.value, '[${0:abc}]()'); + }); + + test('Should create Markdown link snippet when pasteAsMarkdownLink is true', () => { + const uriString = 'https://www.microsoft.com'; + const snippet = appendToLinkSnippet(new vscode.SnippetString(''), '', uriString, 0, true); + assert.strictEqual(snippet?.value, '[${0:Title}](https://www.microsoft.com)'); + }); + + test('Should use an unencoded URI string in Markdown link when passing in an external browser link', () => { + const uriString = 'https://www.microsoft.com'; + const snippet = appendToLinkSnippet(new vscode.SnippetString(''), '', uriString, 0, true); + assert.strictEqual(snippet?.value, '[${0:Title}](https://www.microsoft.com)'); + }); + + test('Should not decode an encoded URI string when passing in an external browser link', () => { + const uriString = 'https://www.microsoft.com/%20'; + const snippet = appendToLinkSnippet(new vscode.SnippetString(''), '', uriString, 0, true); + assert.strictEqual(snippet?.value, '[${0:Title}](https://www.microsoft.com/%20)'); + }); + + test('Should not encode an unencoded URI string when passing in an external browser link', () => { + const uriString = 'https://www.example.com/path?query=value&another=value#fragment'; + const snippet = appendToLinkSnippet(new vscode.SnippetString(''), '', uriString, 0, true); + assert.strictEqual(snippet?.value, '[${0:Title}](https://www.example.com/path?query=value&another=value#fragment)'); + }); + }); + + + suite('checkSmartPaste', () => { + + const skinnyDocument: SkinnyTextDocument = { + uri: vscode.Uri.file('/path/to/your/file'), + offsetAt: function () { return 0; }, + getText: function () { return 'hello world!'; }, + }; + + test('Should evaluate pasteAsMarkdownLink as true for selected plain text', () => { + const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 0, 0, 12), new vscode.Range(0, 0, 0, 12)); + assert.strictEqual(pasteAsMarkdownLink, true); + }); + + test('Should evaluate pasteAsMarkdownLink as false for a valid selected link', () => { + skinnyDocument.getText = function () { return 'https://www.microsoft.com'; }; + const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 0, 0, 25), new vscode.Range(0, 0, 0, 25)); + assert.strictEqual(pasteAsMarkdownLink, false); + }); + + test('Should evaluate pasteAsMarkdownLink as false for a valid selected link with trailing whitespace', () => { + skinnyDocument.getText = function () { return ' https://www.microsoft.com '; }; + const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 0, 0, 30), new vscode.Range(0, 0, 0, 30)); + assert.strictEqual(pasteAsMarkdownLink, false); + }); + + test('Should evaluate pasteAsMarkdownLink as true for a link pasted in square brackets', () => { + skinnyDocument.getText = function () { return '[abc]'; }; + const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 1, 0, 4), new vscode.Range(0, 1, 0, 4)); + assert.strictEqual(pasteAsMarkdownLink, true); + }); + + test('Should evaluate pasteAsMarkdownLink as false for no selection', () => { + const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 0, 0, 0), new vscode.Range(0, 0, 0, 0)); + assert.strictEqual(pasteAsMarkdownLink, false); + }); + + test('Should evaluate pasteAsMarkdownLink as false for selected whitespace and new lines', () => { + skinnyDocument.getText = function () { return ' \r\n\r\n'; }; + const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 0, 0, 7), new vscode.Range(0, 0, 0, 7)); + assert.strictEqual(pasteAsMarkdownLink, false); + }); + + test('Should evaluate pasteAsMarkdownLink as false for pasting within a backtick code block', () => { + skinnyDocument.getText = function () { return '```\r\n\r\n```'; }; + const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 5, 0, 5), new vscode.Range(0, 5, 0, 5)); + assert.strictEqual(pasteAsMarkdownLink, false); + }); + + test('Should evaluate pasteAsMarkdownLink as false for pasting within a tilde code block', () => { + skinnyDocument.getText = function () { return '~~~\r\n\r\n~~~'; }; + const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 5, 0, 5), new vscode.Range(0, 5, 0, 5)); + assert.strictEqual(pasteAsMarkdownLink, false); + }); + + test('Should evaluate pasteAsMarkdownLink as false for pasting within a math block', () => { + skinnyDocument.getText = function () { return '$$$\r\n\r\n$$$'; }; + const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 5, 0, 5), new vscode.Range(0, 5, 0, 5)); + assert.strictEqual(pasteAsMarkdownLink, false); + }); + + const linkSkinnyDoc: SkinnyTextDocument = { + uri: vscode.Uri.file('/path/to/your/file'), + offsetAt: function () { return 0; }, + getText: function () { return '[a](bcdef)'; }, + }; + + test('Should evaluate pasteAsMarkdownLink as false for pasting within a Markdown link', () => { + const pasteAsMarkdownLink = checkSmartPaste(linkSkinnyDoc, new vscode.Range(0, 4, 0, 6), new vscode.Range(0, 4, 0, 6)); + assert.strictEqual(pasteAsMarkdownLink, false); + }); + + + const imageLinkSkinnyDoc: SkinnyTextDocument = { + uri: vscode.Uri.file('/path/to/your/file'), + offsetAt: function () { return 0; }, + getText: function () { return '![a](bcdef)'; }, + }; + + test('Should evaluate pasteAsMarkdownLink as false for pasting within a Markdown image link', () => { + const pasteAsMarkdownLink = checkSmartPaste(imageLinkSkinnyDoc, new vscode.Range(0, 5, 0, 10), new vscode.Range(0, 5, 0, 10)); + assert.strictEqual(pasteAsMarkdownLink, false); + }); + + const inlineCodeSkinnyCode: SkinnyTextDocument = { + uri: vscode.Uri.file('/path/to/your/file'), + offsetAt: function () { return 0; }, + getText: function () { return '``'; }, + }; + + test('Should evaluate pasteAsMarkdownLink as false for pasting within inline code', () => { + const pasteAsMarkdownLink = checkSmartPaste(inlineCodeSkinnyCode, new vscode.Range(0, 1, 0, 1), new vscode.Range(0, 1, 0, 1)); + assert.strictEqual(pasteAsMarkdownLink, false); + }); + + const inlineMathSkinnyDoc: SkinnyTextDocument = { + uri: vscode.Uri.file('/path/to/your/file'), + offsetAt: function () { return 0; }, + getText: function () { return '$$'; }, + }; + + test('Should evaluate pasteAsMarkdownLink as false for pasting within inline math', () => { + const pasteAsMarkdownLink = checkSmartPaste(inlineMathSkinnyDoc, new vscode.Range(0, 1, 0, 1), new vscode.Range(0, 1, 0, 1)); + assert.strictEqual(pasteAsMarkdownLink, false); + }); + }); +}); diff --git a/extensions/markdown-language-features/src/util/document.ts b/extensions/markdown-language-features/src/util/document.ts index 9c192227ee3..856226a7376 100644 --- a/extensions/markdown-language-features/src/util/document.ts +++ b/extensions/markdown-language-features/src/util/document.ts @@ -7,24 +7,24 @@ import * as vscode from 'vscode'; import { Schemes } from './schemes'; import { Utils } from 'vscode-uri'; -export function getDocumentDir(document: vscode.TextDocument): vscode.Uri | undefined { - const docUri = getParentDocumentUri(document); +export function getDocumentDir(uri: vscode.Uri): vscode.Uri | undefined { + const docUri = getParentDocumentUri(uri); if (docUri.scheme === Schemes.untitled) { return vscode.workspace.workspaceFolders?.[0]?.uri; } return Utils.dirname(docUri); } -export function getParentDocumentUri(document: vscode.TextDocument): vscode.Uri { - if (document.uri.scheme === Schemes.notebookCell) { +export function getParentDocumentUri(uri: vscode.Uri): vscode.Uri { + if (uri.scheme === Schemes.notebookCell) { for (const notebook of vscode.workspace.notebookDocuments) { for (const cell of notebook.getCells()) { - if (cell.document === document) { + if (cell.document.uri.toString() === uri.toString()) { return notebook.uri; } } } } - return document.uri; + return uri; } diff --git a/extensions/markdown-language-features/types/previewMessaging.d.ts b/extensions/markdown-language-features/types/previewMessaging.d.ts index ee8f91f596f..05d10af6597 100644 --- a/extensions/markdown-language-features/types/previewMessaging.d.ts +++ b/extensions/markdown-language-features/types/previewMessaging.d.ts @@ -65,9 +65,16 @@ export namespace ToWebviewMessage { readonly content: string; } + export interface CopyImageContent extends BaseMessage { + readonly type: 'copyImage'; + readonly source: string; + readonly id: string; + } + export type Type = | OnDidChangeTextEditorSelection | UpdateView | UpdateContent + | CopyImageContent ; } diff --git a/extensions/markdown-language-features/yarn.lock b/extensions/markdown-language-features/yarn.lock index e796e655bae..8a47f870e93 100644 --- a/extensions/markdown-language-features/yarn.lock +++ b/extensions/markdown-language-features/yarn.lock @@ -165,10 +165,10 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@types/dompurify@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.3.1.tgz#2934adcd31c4e6b02676f9c22f9756e5091c04dd" - integrity sha512-YJth9qa0V/E6/XPH1Jq4BC8uCMmO8V1fKWn8PCvuZcAhMn7q0ez9LW6naQT04UZzjFfAPhyRMZmI2a2rbMlEFA== +"@types/dompurify@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-3.0.2.tgz#c1cd33a475bc49c43c2a7900e41028e2136a4553" + integrity sha512-YBL4ziFebbbfQfH5mlC+QTJsvh0oJUrWbmxKMyEdL7emlHJqGR2Qb34TEFKj+VCayBvjKy3xczMFNhugThUsfQ== dependencies: "@types/trusted-types" "*" @@ -352,10 +352,10 @@ diagnostic-channel@1.1.0: dependencies: semver "^5.3.0" -dompurify@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631" - integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA== +dompurify@^3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.5.tgz#eb3d9cfa10037b6e73f32c586682c4b2ab01fbed" + integrity sha512-F9e6wPGtY+8KNMRAVfxeCOHU0/NPWMSENNq4pQctuXRqqdEPW7q3CrLbR5Nse044WwacyjHGOMlvNsBe1y6z9A== emitter-listener@^1.0.1, emitter-listener@^1.1.1: version "1.1.2" @@ -378,10 +378,10 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -highlight.js@^11.4.0: - version "11.4.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.4.0.tgz#34ceadd49e1596ee5aba3d99346cdfd4845ee05a" - integrity sha512-nawlpCBCSASs7EdvZOYOYVkJpGmAOKMYZgZtUqSRqodZE0GRVcFKwo1RcpeOemqh9hyttTdd5wDBwHkuSyUfnA== +highlight.js@^11.8.0: + version "11.8.0" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.8.0.tgz#966518ea83257bae2e7c9a48596231856555bb65" + integrity sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg== http-proxy-agent@^5.0.0: version "5.0.0" @@ -475,14 +475,14 @@ picomatch@^2.3.1: integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== semver@^5.3.0, semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@^7.3.5: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" diff --git a/extensions/markdown-math/esbuild.js b/extensions/markdown-math/esbuild.js index 88475257524..f8196075a69 100644 --- a/extensions/markdown-math/esbuild.js +++ b/extensions/markdown-math/esbuild.js @@ -6,35 +6,13 @@ const path = require('path'); const fse = require('fs-extra'); -const esbuild = require('esbuild'); const args = process.argv.slice(2); -const isWatch = args.indexOf('--watch') >= 0; - -let outputRoot = __dirname; -const outputRootIndex = args.indexOf('--outputRoot'); -if (outputRootIndex >= 0) { - outputRoot = args[outputRootIndex + 1]; -} - const srcDir = path.join(__dirname, 'notebook'); -const outDir = path.join(outputRoot, 'notebook-out'); - -async function build() { - await esbuild.build({ - entryPoints: [ - path.join(srcDir, 'katex.ts'), - ], - bundle: true, - minify: true, - sourcemap: false, - format: 'esm', - outdir: outDir, - platform: 'browser', - target: ['es2020'], - }); +const outDir = path.join(__dirname, 'notebook-out'); +function postBuild(outDir) { fse.copySync( path.join(__dirname, 'node_modules', 'katex', 'dist', 'katex.min.css'), path.join(outDir, 'katex.min.css')); @@ -51,16 +29,10 @@ async function build() { } } - -build().catch(() => process.exit(1)); - -if (isWatch) { - const watcher = require('@parcel/watcher'); - watcher.subscribe(srcDir, async () => { - try { - await build(); - } catch (e) { - console.error(e); - } - }); -} +require('../esbuild-webview-common').run({ + entryPoints: [ + path.join(srcDir, 'katex.ts'), + ], + srcDir, + outdir: outDir, +}, process.argv, postBuild); diff --git a/extensions/markdown-math/package.json b/extensions/markdown-math/package.json index 077c90d9686..71cb1028e6f 100644 --- a/extensions/markdown-math/package.json +++ b/extensions/markdown-math/package.json @@ -80,6 +80,13 @@ "type": "boolean", "default": true, "description": "%config.markdown.math.enabled%" + }, + "markdown.math.macros": { + "type": "object", + "additionalProperties": { "type": "string" }, + "default": {}, + "description": "%config.markdown.math.macros%", + "scope": "resource" } } } diff --git a/extensions/markdown-math/package.nls.json b/extensions/markdown-math/package.nls.json index fe869a996d0..8e95dac52bb 100644 --- a/extensions/markdown-math/package.nls.json +++ b/extensions/markdown-math/package.nls.json @@ -1,5 +1,6 @@ { "displayName": "Markdown Math", "description": "Adds math support to Markdown in notebooks.", - "config.markdown.math.enabled": "Enable/disable rendering math in the built-in Markdown preview." + "config.markdown.math.enabled": "Enable/disable rendering math in the built-in Markdown preview.", + "config.markdown.math.macros": "A collection of custom macros. Each macro is a key-value pair where the key is a new command name and the value is the expansion of the macro." } diff --git a/extensions/markdown-math/src/extension.ts b/extensions/markdown-math/src/extension.ts index cccd656f924..38fe52b3203 100644 --- a/extensions/markdown-math/src/extension.ts +++ b/extensions/markdown-math/src/extension.ts @@ -6,7 +6,7 @@ import * as vscode from 'vscode'; declare function require(path: string): any; -const enabledSetting = 'markdown.math.enabled'; +const markdownMathSetting = 'markdown.math'; export function activate(context: vscode.ExtensionContext) { function isEnabled(): boolean { @@ -14,8 +14,13 @@ export function activate(context: vscode.ExtensionContext) { return config.get('math.enabled', true); } + function getMacros(): { [key: string]: string } { + const config = vscode.workspace.getConfiguration('markdown'); + return config.get<{ [key: string]: string }>('math.macros', {}); + } + vscode.workspace.onDidChangeConfiguration(e => { - if (e.affectsConfiguration(enabledSetting)) { + if (e.affectsConfiguration(markdownMathSetting)) { vscode.commands.executeCommand('markdown.api.reloadPlugins'); } }, undefined, context.subscriptions); @@ -24,8 +29,11 @@ export function activate(context: vscode.ExtensionContext) { extendMarkdownIt(md: any) { if (isEnabled()) { const katex = require('@vscode/markdown-it-katex'); - const options = { globalGroup: true, macros: {} }; - md.core.ruler.push('reset-katex-macros', () => { options.macros = {}; }); + const settingsMacros = getMacros(); + const options = { globalGroup: true, macros: { ...settingsMacros } }; + md.core.ruler.push('reset-katex-macros', () => { + options.macros = { ...settingsMacros }; + }); return md.use(katex, options); } return md; diff --git a/extensions/media-preview/media/videoPreview.js b/extensions/media-preview/media/videoPreview.js index 4cf22d3b446..eeed26972a3 100644 --- a/extensions/media-preview/media/videoPreview.js +++ b/extensions/media-preview/media/videoPreview.js @@ -33,6 +33,9 @@ } video.playsInline = true; video.controls = true; + video.autoplay = settings.autoplay; + video.muted = settings.autoplay; + video.loop = settings.loop; function onLoaded() { if (hasLoadedMedia) { diff --git a/extensions/media-preview/package.json b/extensions/media-preview/package.json index 795316f8b89..3107d9d60bf 100644 --- a/extensions/media-preview/package.json +++ b/extensions/media-preview/package.json @@ -27,6 +27,22 @@ } }, "contributes": { + "configuration": { + "type": "object", + "title": "Media Previewer", + "properties": { + "mediaPreview.video.autoPlay": { + "type": "boolean", + "default": false, + "markdownDescription": "%videoPreviewerAutoPlay%" + }, + "mediaPreview.video.loop": { + "type": "boolean", + "default": false, + "markdownDescription": "%videoPreviewerLoop%" + } + } + }, "customEditors": [ { "viewType": "imagePreview.previewEditor", diff --git a/extensions/media-preview/package.nls.json b/extensions/media-preview/package.nls.json index 27fe241cf6b..c45e1e2613b 100644 --- a/extensions/media-preview/package.nls.json +++ b/extensions/media-preview/package.nls.json @@ -4,6 +4,8 @@ "customEditor.audioPreview.displayName": "Audio Preview", "customEditor.imagePreview.displayName": "Image Preview", "customEditor.videoPreview.displayName": "Video Preview", + "videoPreviewerAutoPlay": "Start playing videos on mute automatically.", + "videoPreviewerLoop": "Loop videos over again automatically.", "command.zoomIn": "Zoom in", "command.zoomOut": "Zoom out", "command.copyImage": "Copy" diff --git a/extensions/media-preview/src/videoPreview.ts b/extensions/media-preview/src/videoPreview.ts index 5897792f667..efc6be76a4f 100644 --- a/extensions/media-preview/src/videoPreview.ts +++ b/extensions/media-preview/src/videoPreview.ts @@ -54,8 +54,11 @@ class VideoPreview extends MediaPreview { protected async getWebviewContents(): Promise { const version = Date.now().toString(); + const configurations = vscode.workspace.getConfiguration('mediaPreview.video'); const settings = { src: await this.getResourcePath(this.webviewEditor, this.resource, version), + autoplay: configurations.get('autoPlay'), + loop: configurations.get('loop'), }; const nonce = getNonce(); diff --git a/extensions/media-preview/yarn.lock b/extensions/media-preview/yarn.lock index 2fb59ea6fef..971c4c2c50a 100644 --- a/extensions/media-preview/yarn.lock +++ b/extensions/media-preview/yarn.lock @@ -318,9 +318,9 @@ ms@2.1.2: integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== semver@^5.3.0, semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== shimmer@^1.1.0, shimmer@^1.2.0: version "1.2.1" diff --git a/extensions/merge-conflict/yarn.lock b/extensions/merge-conflict/yarn.lock index 8625415ddeb..d07fe97f099 100644 --- a/extensions/merge-conflict/yarn.lock +++ b/extensions/merge-conflict/yarn.lock @@ -323,9 +323,9 @@ ms@2.1.2: integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== semver@^5.3.0, semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== shimmer@^1.1.0, shimmer@^1.2.0: version "1.2.1" diff --git a/extensions/microsoft-authentication/extension-browser.webpack.config.js b/extensions/microsoft-authentication/extension-browser.webpack.config.js index c9cb43b944b..c32a44124a2 100644 --- a/extensions/microsoft-authentication/extension-browser.webpack.config.js +++ b/extensions/microsoft-authentication/extension-browser.webpack.config.js @@ -24,9 +24,6 @@ module.exports = withBrowserDefaults({ 'keytar': 'commonjs keytar', }, resolve: { - fallback: { - 'querystring': require.resolve('querystring-es3') - }, alias: { './node/crypto': path.resolve(__dirname, 'src/browser/crypto'), './node/authServer': path.resolve(__dirname, 'src/browser/authServer'), diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json index 702b5cbfd1f..ecd2573ebf6 100644 --- a/extensions/microsoft-authentication/package.json +++ b/extensions/microsoft-authentication/package.json @@ -41,20 +41,58 @@ { "title": "Microsoft Sovereign Cloud", "properties": { - "microsoft-sovereign-cloud.endpoint": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "string", - "enum": [ - "Azure China", - "Azure US Government" - ] - } + "microsoft-sovereign-cloud.environment": { + "type": "string", + "markdownDescription": "%microsoft-sovereign-cloud.environment.description%", + "enum": [ + "ChinaCloud", + "USGovernment", + "custom" ], - "description": "%microsoft-sovereign-cloud.endpoint.description%" + "enumDescriptions": [ + "%microsoft-sovereign-cloud.environment.enumDescriptions.AzureChinaCloud%", + "%microsoft-sovereign-cloud.environment.enumDescriptions.AzureUSGovernment%", + "%microsoft-sovereign-cloud.environment.enumDescriptions.custom%" + ] + }, + "microsoft-sovereign-cloud.customEnvironment": { + "type": "object", + "additionalProperties": true, + "markdownDescription": "%microsoft-sovereign-cloud.customEnvironment.description%", + "properties": { + "name": { + "type": "string", + "description": "%microsoft-sovereign-cloud.customEnvironment.name.description%" + }, + "portalUrl": { + "type": "string", + "description": "%microsoft-sovereign-cloud.customEnvironment.portalUrl.description%" + }, + "managementEndpointUrl": { + "type": "string", + "description": "%microsoft-sovereign-cloud.customEnvironment.managementEndpointUrl.description%" + }, + "resourceManagerEndpointUrl": { + "type": "string", + "description": "%microsoft-sovereign-cloud.customEnvironment.resourceManagerEndpointUrl.description%" + }, + "activeDirectoryEndpointUrl": { + "type": "string", + "description": "%microsoft-sovereign-cloud.customEnvironment.activeDirectoryEndpointUrl.description%" + }, + "activeDirectoryResourceId": { + "type": "string", + "description": "%microsoft-sovereign-cloud.customEnvironment.activeDirectoryResourceId.description%" + } + }, + "required": [ + "name", + "portalUrl", + "managementEndpointUrl", + "resourceManagerEndpointUrl", + "activeDirectoryEndpointUrl", + "activeDirectoryResourceId" + ] } } } @@ -75,11 +113,11 @@ "@types/node-fetch": "^2.5.7", "@types/randombytes": "^2.0.0", "@types/sha.js": "^2.4.0", - "@types/uuid": "8.0.0", - "querystring-es3": "^0.2.1" + "@types/uuid": "8.0.0" }, "dependencies": { "node-fetch": "2.6.7", + "@azure/ms-rest-azure-env": "^2.0.0", "@vscode/extension-telemetry": "0.7.5" }, "repository": { diff --git a/extensions/microsoft-authentication/package.nls.json b/extensions/microsoft-authentication/package.nls.json index 12f51bb0163..14c625dc762 100644 --- a/extensions/microsoft-authentication/package.nls.json +++ b/extensions/microsoft-authentication/package.nls.json @@ -3,5 +3,27 @@ "description": "Microsoft authentication provider", "signIn": "Sign In", "signOut": "Sign Out", - "microsoft-sovereign-cloud.endpoint.description": "Login endpoint for Azure authentication. Select a national cloud or enter the login URL for a custom Azure cloud." + "microsoft-sovereign-cloud.environment.description": { + "message": "The Sovereign Cloud to use for authentication. If you select `custom`, you must also set the `#microsoft-sovereign-cloud.customEnvironment#` setting.", + "comment": [ + "{Locked='`#microsoft-sovereign-cloud.customEnvironment#`'}", + "The `#microsoft-sovereign-cloud.customEnvironment#` syntax will turn into a link. Do not translate it." + ] + }, + "microsoft-sovereign-cloud.environment.enumDescriptions.AzureChinaCloud": "Azure China", + "microsoft-sovereign-cloud.environment.enumDescriptions.AzureUSGovernment": "Azure US Government", + "microsoft-sovereign-cloud.environment.enumDescriptions.custom": "A custom Microsoft Sovereign Cloud", + "microsoft-sovereign-cloud.customEnvironment.description": { + "message": "The custom configuration for the Sovereign Cloud to use with the Microsoft Sovereign Cloud authentication provider. This along with setting `#microsoft-sovereign-cloud.environment#` to `custom` is required to use this feature.", + "comment": [ + "{Locked='`#microsoft-sovereign-cloud.environment#`'}", + "The `#microsoft-sovereign-cloud.environment#` syntax will turn into a link. Do not translate it." + ] + }, + "microsoft-sovereign-cloud.customEnvironment.name.description": "The name of the custom Sovereign Cloud.", + "microsoft-sovereign-cloud.customEnvironment.portalUrl.description": "The portal URL for the custom Sovereign Cloud.", + "microsoft-sovereign-cloud.customEnvironment.managementEndpointUrl.description": "The management endpoint for the custom Sovereign Cloud.", + "microsoft-sovereign-cloud.customEnvironment.resourceManagerEndpointUrl.description": "The resource manager endpoint for the custom Sovereign Cloud.", + "microsoft-sovereign-cloud.customEnvironment.activeDirectoryEndpointUrl.description": "The Active Directory endpoint for the custom Sovereign Cloud.", + "microsoft-sovereign-cloud.customEnvironment.activeDirectoryResourceId.description": "The Active Directory resource ID for the custom Sovereign Cloud." } diff --git a/extensions/microsoft-authentication/src/AADHelper.ts b/extensions/microsoft-authentication/src/AADHelper.ts index 9d77be2a4f8..d7e92e104fb 100644 --- a/extensions/microsoft-authentication/src/AADHelper.ts +++ b/extensions/microsoft-authentication/src/AADHelper.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import * as querystring from 'querystring'; import * as path from 'path'; import { isSupportedEnvironment } from './utils'; import { generateCodeChallenge, generateCodeVerifier, randomUUID } from './cryptoUtils'; @@ -14,9 +13,10 @@ import { base64Decode } from './node/buffer'; import { fetching } from './node/fetch'; import { UriEventHandler } from './UriEventHandler'; import TelemetryReporter from '@vscode/extension-telemetry'; +import { Environment } from '@azure/ms-rest-azure-env'; const redirectUrl = 'https://vscode.dev/redirect'; -const defaultLoginEndpointUrl = 'https://login.microsoftonline.com/'; +const defaultActiveDirectoryEndpointUrl = Environment.AzureCloud.activeDirectoryEndpointUrl; const DEFAULT_CLIENT_ID = 'aebc6443-996d-45c2-90f0-388ff96faa56'; const DEFAULT_TENANT = 'organizations'; const MSA_TID = '9188040d-6c67-4c5b-b112-36a304b66dad'; @@ -102,7 +102,7 @@ export class AzureActiveDirectoryService { private readonly _uriHandler: UriEventHandler, private readonly _tokenStorage: BetterTokenStorage, private readonly _telemetryReporter: TelemetryReporter, - private readonly _loginEndpointUrl: string = defaultLoginEndpointUrl + private readonly _env: Environment ) { _context.subscriptions.push(this._tokenStorage.onDidChangeInOtherWindow((e) => this.checkForUpdates(e))); } @@ -301,7 +301,7 @@ export class AzureActiveDirectoryService { const runsRemote = vscode.env.remoteName !== undefined; const runsServerless = vscode.env.remoteName === undefined && vscode.env.uiKind === vscode.UIKind.Web; - if (runsServerless && this._loginEndpointUrl !== defaultLoginEndpointUrl) { + if (runsServerless && this._env.activeDirectoryEndpointUrl !== defaultActiveDirectoryEndpointUrl) { throw new Error('Sign in to non-public clouds is not supported on the web.'); } @@ -310,9 +310,7 @@ export class AzureActiveDirectoryService { } try { - const session = await this.createSessionWithLocalServer(scopeData); - this._sessionChangeEmitter.fire({ added: [session], removed: [], changed: [] }); - return session; + return await this.createSessionWithLocalServer(scopeData); } catch (e) { this._logger.error(`Error creating session for scopes: ${scopeData.scopeStr} Error: ${e}`); @@ -338,7 +336,7 @@ export class AzureActiveDirectoryService { code_challenge_method: 'S256', code_challenge: codeChallenge, }).toString(); - const loginUrl = `${this._loginEndpointUrl}${scopeData.tenant}/oauth2/v2.0/authorize?${qs}`; + const loginUrl = new URL(`${scopeData.tenant}/oauth2/v2.0/authorize?${qs}`, this._env.activeDirectoryEndpointUrl).toString(); const server = new LoopbackAuthServer(path.join(__dirname, '../media'), loginUrl); await server.start(); @@ -354,6 +352,7 @@ export class AzureActiveDirectoryService { } const session = await this.exchangeCodeForSession(codeToExchange, codeVerifier, scopeData); + this._sessionChangeEmitter.fire({ added: [session], removed: [], changed: [] }); return session; } @@ -368,8 +367,8 @@ export class AzureActiveDirectoryService { const state = encodeURIComponent(callbackUri.toString(true)); const codeVerifier = generateCodeVerifier(); const codeChallenge = await generateCodeChallenge(codeVerifier); - const signInUrl = `${this._loginEndpointUrl}${scopeData.tenant}/oauth2/v2.0/authorize`; - const oauthStartQuery = new URLSearchParams({ + const signInUrl = new URL(`${scopeData.tenant}/oauth2/v2.0/authorize`, this._env.activeDirectoryEndpointUrl); + signInUrl.search = new URLSearchParams({ response_type: 'code', client_id: encodeURIComponent(scopeData.clientId), response_mode: 'query', @@ -379,8 +378,8 @@ export class AzureActiveDirectoryService { prompt: 'select_account', code_challenge_method: 'S256', code_challenge: codeChallenge, - }); - const uri = vscode.Uri.parse(`${signInUrl}?${oauthStartQuery.toString()}`); + }).toString(); + const uri = vscode.Uri.parse(signInUrl.toString()); vscode.env.openExternal(uri); let inputBox: vscode.InputBox | undefined; @@ -601,19 +600,15 @@ export class AzureActiveDirectoryService { private async doRefreshToken(refreshToken: string, scopeData: IScopeData, sessionId?: string): Promise { this._logger.info(`Refreshing token for scopes: ${scopeData.scopeStr}`); - const postData = querystring.stringify({ + const postData = new URLSearchParams({ refresh_token: refreshToken, client_id: scopeData.clientId, grant_type: 'refresh_token', scope: scopeData.scopesToSend - }); - - const proxyEndpoints: { [providerId: string]: string } | undefined = await vscode.commands.executeCommand('workbench.getCodeExchangeProxyEndpoints'); - const endpointUrl = proxyEndpoints?.microsoft || this._loginEndpointUrl; - const endpoint = `${endpointUrl}${scopeData.tenant}/oauth2/v2.0/token`; + }).toString(); try { - const json = await this.fetchTokenResponse(endpoint, postData, scopeData); + const json = await this.fetchTokenResponse(postData, scopeData); const token = this.convertToTokenSync(json, scopeData, sessionId); if (token.expiresIn) { this.setSessionTimeout(token.sessionId, token.refreshToken, scopeData, token.expiresIn * AzureActiveDirectoryService.REFRESH_TIMEOUT_MODIFIER); @@ -666,8 +661,9 @@ export class AzureActiveDirectoryService { return new Promise((resolve: (value: vscode.AuthenticationSession) => void, reject) => { uriEventListener = this._uriHandler.event(async (uri: vscode.Uri) => { try { - const query = querystring.parse(uri.query); - let { code, nonce } = query; + const query = new URLSearchParams(uri.query); + let code = query.get('code'); + let nonce = query.get('nonce'); if (Array.isArray(code)) { code = code[0]; } @@ -693,6 +689,7 @@ export class AzureActiveDirectoryService { } const session = await this.exchangeCodeForSession(code, verifier, scopeData); + this._sessionChangeEmitter.fire({ added: [session], removed: [], changed: [] }); resolve(session); } catch (err) { reject(err); @@ -719,6 +716,7 @@ export class AzureActiveDirectoryService { if (code) { inputBox.dispose(); const session = await this.exchangeCodeForSession(code, verifier, scopeData); + this._sessionChangeEmitter.fire({ added: [session], removed: [], changed: [] }); resolve(session); } }); @@ -735,28 +733,16 @@ export class AzureActiveDirectoryService { this._logger.info(`Exchanging login code for token for scopes: ${scopeData.scopeStr}`); let token: IToken | undefined; try { - const postData = querystring.stringify({ + const postData = new URLSearchParams({ grant_type: 'authorization_code', code: code, client_id: scopeData.clientId, scope: scopeData.scopesToSend, code_verifier: codeVerifier, redirect_uri: redirectUrl - }); + }).toString(); - let endpointUrl: string; - - if (this._loginEndpointUrl !== defaultLoginEndpointUrl) { - // If this is for sovereign clouds, don't try using the proxy endpoint, which supports only public cloud - endpointUrl = this._loginEndpointUrl; - } else { - const proxyEndpoints: { [providerId: string]: string } | undefined = await vscode.commands.executeCommand('workbench.getCodeExchangeProxyEndpoints'); - endpointUrl = proxyEndpoints?.microsoft || this._loginEndpointUrl; - } - - const endpoint = `${endpointUrl}${scopeData.tenant}/oauth2/v2.0/token`; - - const json = await this.fetchTokenResponse(endpoint, postData, scopeData); + const json = await this.fetchTokenResponse(postData, scopeData); this._logger.info(`Exchanging login code for token (for scopes: ${scopeData.scopeStr}) succeeded!`); token = this.convertToTokenSync(json, scopeData); } catch (e) { @@ -772,7 +758,17 @@ export class AzureActiveDirectoryService { return await this.convertToSession(token, scopeData); } - private async fetchTokenResponse(endpoint: string, postData: string, scopeData: IScopeData): Promise { + private async fetchTokenResponse(postData: string, scopeData: IScopeData): Promise { + let endpointUrl: string; + if (this._env.activeDirectoryEndpointUrl !== defaultActiveDirectoryEndpointUrl) { + // If this is for sovereign clouds, don't try using the proxy endpoint, which supports only public cloud + endpointUrl = this._env.activeDirectoryEndpointUrl; + } else { + const proxyEndpoints: { [providerId: string]: string } | undefined = await vscode.commands.executeCommand('workbench.getCodeExchangeProxyEndpoints'); + endpointUrl = proxyEndpoints?.microsoft || this._env.activeDirectoryEndpointUrl; + } + const endpoint = new URL(`${scopeData.tenant}/oauth2/v2.0/token`, endpointUrl); + let attempts = 0; while (attempts <= 3) { attempts++; @@ -869,7 +865,7 @@ export class AzureActiveDirectoryService { refreshToken: token.refreshToken, scope: token.scope, account: token.account, - endpoint: this._loginEndpointUrl, + endpoint: this._env.activeDirectoryEndpointUrl, }); this._logger.info(`Stored token for scopes: ${scopeData.scopeStr}`); } @@ -933,9 +929,9 @@ export class AzureActiveDirectoryService { private sessionMatchesEndpoint(session: IStoredSession): boolean { // For older sessions with no endpoint set, it can be assumed to be the default endpoint - session.endpoint ||= defaultLoginEndpointUrl; + session.endpoint ||= defaultActiveDirectoryEndpointUrl; - return session.endpoint === this._loginEndpointUrl; + return session.endpoint === this._env.activeDirectoryEndpointUrl; } //#endregion diff --git a/extensions/microsoft-authentication/src/extension.ts b/extensions/microsoft-authentication/src/extension.ts index 121872f260f..767c0a17963 100644 --- a/extensions/microsoft-authentication/src/extension.ts +++ b/extensions/microsoft-authentication/src/extension.ts @@ -4,36 +4,46 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; +import { Environment, EnvironmentParameters } from '@azure/ms-rest-azure-env'; import { AzureActiveDirectoryService, IStoredSession } from './AADHelper'; import { BetterTokenStorage } from './betterSecretStorage'; import { UriEventHandler } from './UriEventHandler'; import TelemetryReporter from '@vscode/extension-telemetry'; async function initMicrosoftSovereignCloudAuthProvider(context: vscode.ExtensionContext, telemetryReporter: TelemetryReporter, uriHandler: UriEventHandler, tokenStorage: BetterTokenStorage): Promise { - let settingValue = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get('endpoint'); + const environment = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get('environment'); let authProviderName: string | undefined; - if (!settingValue) { + if (!environment) { return undefined; - } else if (settingValue === 'Azure China') { - authProviderName = settingValue; - settingValue = 'https://login.chinacloudapi.cn/'; - } else if (settingValue === 'Azure US Government') { - authProviderName = settingValue; - settingValue = 'https://login.microsoftonline.us/'; } - // validate user value - let uri: vscode.Uri; - try { - uri = vscode.Uri.parse(settingValue, true); - } catch (e) { - vscode.window.showErrorMessage(vscode.l10n.t('Microsoft Sovereign Cloud login URI is not a valid URI: {0}', e.message ?? e)); - return; + if (environment === 'custom') { + const customEnv = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get('customEnvironment'); + if (!customEnv) { + const res = await vscode.window.showErrorMessage(vscode.l10n.t('You must also specify a custom environment in order to use the custom environment auth provider.'), vscode.l10n.t('Open settings')); + if (res) { + await vscode.commands.executeCommand('workbench.action.openSettingsJson', 'microsoft-sovereign-cloud.customEnvironment'); + } + return undefined; + } + try { + Environment.add(customEnv); + } catch (e) { + const res = await vscode.window.showErrorMessage(vscode.l10n.t('Error validating custom environment setting: {0}', e.message), vscode.l10n.t('Open settings')); + if (res) { + await vscode.commands.executeCommand('workbench.action.openSettings', 'microsoft-sovereign-cloud.customEnvironment'); + } + return undefined; + } + authProviderName = customEnv.name; + } else { + authProviderName = environment; } - // Add trailing slash if needed - if (!settingValue.endsWith('/')) { - settingValue += '/'; + const env = Environment.get(authProviderName); + if (!env) { + const res = await vscode.window.showErrorMessage(vscode.l10n.t('The environment `{0}` is not a valid environment.', authProviderName), vscode.l10n.t('Open settings')); + return undefined; } const aadService = new AzureActiveDirectoryService( @@ -42,10 +52,9 @@ async function initMicrosoftSovereignCloudAuthProvider(context: vscode.Extension uriHandler, tokenStorage, telemetryReporter, - settingValue); + env); await aadService.initialize(); - authProviderName ||= uri.authority; const disposable = vscode.authentication.registerAuthenticationProvider('microsoft-sovereign-cloud', authProviderName, { onDidChangeSessions: aadService.onDidChangeSessions, getSessions: (scopes: string[]) => aadService.getSessions(scopes), @@ -108,7 +117,8 @@ export async function activate(context: vscode.ExtensionContext) { context, uriHandler, betterSecretStorage, - telemetryReporter); + telemetryReporter, + Environment.AzureCloud); await loginService.initialize(); context.subscriptions.push(vscode.authentication.registerAuthenticationProvider('microsoft', 'Microsoft', { @@ -158,7 +168,7 @@ export async function activate(context: vscode.ExtensionContext) { let microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage); context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(async e => { - if (e.affectsConfiguration('microsoft-sovereign-cloud.endpoint')) { + if (e.affectsConfiguration('microsoft-sovereign-cloud')) { microsoftSovereignCloudAuthProviderDisposable?.dispose(); microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage); } diff --git a/extensions/microsoft-authentication/yarn.lock b/extensions/microsoft-authentication/yarn.lock index 5513eb3e992..cd9ae79d100 100644 --- a/extensions/microsoft-authentication/yarn.lock +++ b/extensions/microsoft-authentication/yarn.lock @@ -55,6 +55,11 @@ dependencies: tslib "^2.2.0" +"@azure/ms-rest-azure-env@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz#45809f89763a480924e21d3c620cd40866771625" + integrity sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw== + "@microsoft/1ds-core-js@3.2.8", "@microsoft/1ds-core-js@^3.2.8": version "3.2.8" resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.8.tgz#1b6b7d9bb858238c818ccf4e4b58ece7aeae5760" @@ -370,15 +375,10 @@ node-fetch@2.6.7: dependencies: whatwg-url "^5.0.0" -querystring-es3@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA== - semver@^5.3.0, semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== shimmer@^1.1.0, shimmer@^1.2.0: version "1.2.1" diff --git a/extensions/notebook-renderers/esbuild.js b/extensions/notebook-renderers/esbuild.js index c374cc5fc1c..55d462f8bc3 100644 --- a/extensions/notebook-renderers/esbuild.js +++ b/extensions/notebook-renderers/esbuild.js @@ -4,41 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // @ts-check const path = require('path'); -const esbuild = require('esbuild'); - -const args = process.argv.slice(2); - -const isWatch = args.indexOf('--watch') >= 0; - -let outputRoot = __dirname; -const outputRootIndex = args.indexOf('--outputRoot'); -if (outputRootIndex >= 0) { - outputRoot = args[outputRootIndex + 1]; -} const srcDir = path.join(__dirname, 'src'); -const outDir = path.join(outputRoot, 'renderer-out'); +const outDir = path.join(__dirname, 'renderer-out'); -function build() { - return esbuild.build({ - entryPoints: [ - path.join(srcDir, 'index.ts'), - ], - bundle: true, - minify: false, - sourcemap: false, - format: 'esm', - outdir: outDir, - platform: 'browser', - target: ['es2020'], - }); -} - -build().catch(() => process.exit(1)); - -if (isWatch) { - const watcher = require('@parcel/watcher'); - watcher.subscribe(srcDir, () => { - return build(); - }); -} +require('../esbuild-webview-common').run({ + entryPoints: [ + path.join(srcDir, 'index.ts'), + ], + srcDir, + outdir: outDir, +}, process.argv); diff --git a/extensions/notebook-renderers/src/index.ts b/extensions/notebook-renderers/src/index.ts index efd9a81bfac..090e9719420 100644 --- a/extensions/notebook-renderers/src/index.ts +++ b/extensions/notebook-renderers/src/index.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import type { ActivationFunction, OutputItem, RendererContext } from 'vscode-notebook-renderer'; -import { createOutputContent, scrollableClass } from './textHelper'; -import { HtmlRenderingHook, IDisposable, IRichRenderContext, JavaScriptRenderingHook, RenderOptions } from './rendererTypes'; +import { createOutputContent, appendOutput, scrollableClass } from './textHelper'; +import { HtmlRenderingHook, IDisposable, IRichRenderContext, JavaScriptRenderingHook, OutputWithAppend, RenderOptions } from './rendererTypes'; import { ttPolicy } from './htmlHelper'; function clearContainer(container: HTMLElement) { @@ -33,6 +33,10 @@ function renderImage(outputInfo: OutputItem, element: HTMLElement): IDisposable const image = document.createElement('img'); image.src = src; + const alt = getAltText(outputInfo); + if (alt) { + image.alt = alt; + } const display = document.createElement('div'); display.classList.add('display'); display.appendChild(image); @@ -64,12 +68,33 @@ const domEval = (container: Element) => { } }; +function getAltText(outputInfo: OutputItem) { + const metadata = outputInfo.metadata; + if (typeof metadata === 'object' && metadata && 'vscode_altText' in metadata && typeof metadata.vscode_altText === 'string') { + return metadata.vscode_altText; + } + return undefined; +} + +function injectTitleForSvg(outputInfo: OutputItem, element: HTMLElement) { + if (outputInfo.mime.indexOf('svg') > -1) { + const svgElement = element.querySelector('svg'); + const altText = getAltText(outputInfo); + if (svgElement && altText) { + const title = document.createElement('title'); + title.innerText = altText; + svgElement.prepend(title); + } + } +} + async function renderHTML(outputInfo: OutputItem, container: HTMLElement, signal: AbortSignal, hooks: Iterable): Promise { clearContainer(container); let element: HTMLElement = document.createElement('div'); const htmlContent = outputInfo.text(); const trustedHtml = ttPolicy?.createHTML(htmlContent) ?? htmlContent; element.innerHTML = trustedHtml as string; + injectTitleForSvg(outputInfo, element); for (const hook of hooks) { element = (await hook.postRender(outputInfo, element, signal)) ?? element; @@ -127,7 +152,7 @@ function renderError( outputInfo: OutputItem, outputElement: HTMLElement, ctx: IRichRenderContext, - trustHTML: boolean + trustHtml: boolean ): IDisposable { const disposableStore = createDisposableStore(); @@ -147,7 +172,7 @@ function renderError( outputElement.classList.add('traceback'); const outputScrolling = scrollingEnabled(outputInfo, ctx.settings); - const content = createOutputContent(outputInfo.id, [err.stack ?? ''], ctx.settings.lineLimit, outputScrolling, trustHTML); + const content = createOutputContent(outputInfo.id, err.stack ?? '', { linesLimit: ctx.settings.lineLimit, scrollable: outputScrolling, trustHtml }); const contentParent = document.createElement('div'); contentParent.classList.toggle('word-wrap', ctx.settings.outputWordWrap); disposableStore.push(ctx.onDidChangeSettings(e => { @@ -240,46 +265,53 @@ function scrollingEnabled(output: OutputItem, options: RenderOptions) { metadata.scrollable : options.outputScrolling; } -function renderStream(outputInfo: OutputItem, outputElement: HTMLElement, error: boolean, ctx: IRichRenderContext): IDisposable { +// div.cell_container +// div.output_container +// div.output.output-stream <-- outputElement parameter +// div.scrollable? tabindex="0" <-- contentParent +// div output-item-id="{guid}" <-- content from outputItem parameter +function renderStream(outputInfo: OutputWithAppend, outputElement: HTMLElement, error: boolean, ctx: IRichRenderContext): IDisposable { const disposableStore = createDisposableStore(); const outputScrolling = scrollingEnabled(outputInfo, ctx.settings); + const outputOptions = { linesLimit: ctx.settings.lineLimit, scrollable: outputScrolling, trustHtml: false, error }; outputElement.classList.add('output-stream'); - const text = outputInfo.text(); - const content = createOutputContent(outputInfo.id, [text], ctx.settings.lineLimit, outputScrolling, false); - content.setAttribute('output-item-id', outputInfo.id); - if (error) { - content.classList.add('error'); - } - const scrollTop = outputScrolling ? findScrolledHeight(outputElement) : undefined; + const previousOutputParent = getPreviousMatchingContentGroup(outputElement); // If the previous output item for the same cell was also a stream, append this output to the previous - const existingContentParent = getPreviousMatchingContentGroup(outputElement); - if (existingContentParent) { - const existing = existingContentParent.querySelector(`[output-item-id="${outputInfo.id}"]`) as HTMLElement | null; - if (existing) { - existing.replaceWith(content); + if (previousOutputParent) { + const existingContent = previousOutputParent.querySelector(`[output-item-id="${outputInfo.id}"]`) as HTMLElement | null; + if (existingContent) { + appendOutput(outputInfo, existingContent, outputOptions); } else { - existingContentParent.appendChild(content); + const newContent = createOutputContent(outputInfo.id, outputInfo.text(), outputOptions); + previousOutputParent.appendChild(newContent); } - existingContentParent.classList.toggle('scrollbar-visible', existingContentParent.scrollHeight > existingContentParent.clientHeight); - existingContentParent.scrollTop = scrollTop !== undefined ? scrollTop : existingContentParent.scrollHeight; + previousOutputParent.classList.toggle('scrollbar-visible', previousOutputParent.scrollHeight > previousOutputParent.clientHeight); + previousOutputParent.scrollTop = scrollTop !== undefined ? scrollTop : previousOutputParent.scrollHeight; } else { - const contentParent = document.createElement('div'); - contentParent.appendChild(content); + const existingContent = outputElement.querySelector(`[output-item-id="${outputInfo.id}"]`) as HTMLElement | null; + let contentParent = existingContent?.parentElement; + if (existingContent && contentParent) { + appendOutput(outputInfo, existingContent, outputOptions); + } else { + const newContent = createOutputContent(outputInfo.id, outputInfo.text(), outputOptions); + contentParent = document.createElement('div'); + contentParent.appendChild(newContent); + while (outputElement.firstChild) { + outputElement.removeChild(outputElement.firstChild); + } + outputElement.appendChild(contentParent); + } + contentParent.classList.toggle('scrollable', outputScrolling); contentParent.classList.toggle('word-wrap', ctx.settings.outputWordWrap); disposableStore.push(ctx.onDidChangeSettings(e => { - contentParent.classList.toggle('word-wrap', e.outputWordWrap); + contentParent!.classList.toggle('word-wrap', e.outputWordWrap); })); - - while (outputElement.firstChild) { - outputElement.removeChild(outputElement.firstChild); - } - outputElement.appendChild(contentParent); initializeScroll(contentParent, disposableStore, scrollTop); } @@ -292,7 +324,7 @@ function renderText(outputInfo: OutputItem, outputElement: HTMLElement, ctx: IRi const text = outputInfo.text(); const outputScrolling = scrollingEnabled(outputInfo, ctx.settings); - const content = createOutputContent(outputInfo.id, [text], ctx.settings.lineLimit, ctx.settings.outputScrolling, false); + const content = createOutputContent(outputInfo.id, text, { linesLimit: ctx.settings.lineLimit, scrollable: outputScrolling, trustHtml: false }); content.classList.add('output-plaintext'); if (ctx.settings.outputWordWrap) { content.classList.add('word-wrap'); diff --git a/extensions/notebook-renderers/src/rendererTypes.ts b/extensions/notebook-renderers/src/rendererTypes.ts index 9da94aeef5d..ded12bdcacc 100644 --- a/extensions/notebook-renderers/src/rendererTypes.ts +++ b/extensions/notebook-renderers/src/rendererTypes.ts @@ -35,3 +35,14 @@ export interface RenderOptions { } export type IRichRenderContext = RendererContext & { readonly settings: RenderOptions; readonly onDidChangeSettings: Event }; + +export type OutputElementOptions = { + linesLimit: number; + scrollable?: boolean; + error?: boolean; + trustHtml?: boolean; +}; + +export interface OutputWithAppend extends OutputItem { + appendedText?(): string | undefined; +} diff --git a/extensions/notebook-renderers/src/test/notebookRenderer.test.ts b/extensions/notebook-renderers/src/test/notebookRenderer.test.ts index 3ce2c4019e8..0f747900377 100644 --- a/extensions/notebook-renderers/src/test/notebookRenderer.test.ts +++ b/extensions/notebook-renderers/src/test/notebookRenderer.test.ts @@ -5,8 +5,8 @@ import * as assert from 'assert'; import { activate } from '..'; -import { OutputItem, RendererApi } from 'vscode-notebook-renderer'; -import { IRichRenderContext, RenderOptions } from '../rendererTypes'; +import { RendererApi } from 'vscode-notebook-renderer'; +import { IDisposable, IRichRenderContext, OutputWithAppend, RenderOptions } from '../rendererTypes'; import { JSDOM } from "jsdom"; const dom = new JSDOM(); @@ -37,7 +37,15 @@ suite('Notebook builtin output renderer', () => { type optionalRenderOptions = { [k in keyof RenderOptions]?: RenderOptions[k] }; + type handler = (e: RenderOptions) => any; + + const settingsChangedHandlers: handler[] = []; + function fireSettingsChange(options: optionalRenderOptions) { + settingsChangedHandlers.forEach((handler) => handler(options as RenderOptions)); + } + function createContext(settings?: optionalRenderOptions): IRichRenderContext { + settingsChangedHandlers.length = 0; return { setState(_value: void) { }, getState() { return undefined; }, @@ -48,9 +56,16 @@ suite('Notebook builtin output renderer', () => { lineLimit: 30, ...settings } as RenderOptions, - onDidChangeSettings(_listener: (e: T) => any, _thisArgs?: any, _disposables?: any) { + onDidChangeSettings(listener: handler, _thisArgs?: any, disposables?: IDisposable[]) { + settingsChangedHandlers.push(listener); + + const dispose = () => { + settingsChangedHandlers.splice(settingsChangedHandlers.indexOf(listener), 1); + }; + + disposables?.push({ dispose }); return { - dispose(): void { } + dispose }; }, workspace: { @@ -83,6 +98,10 @@ suite('Notebook builtin output renderer', () => { this.firstOutput = outputElement; } + public get cellElement() { + return this.cell; + } + public getFirstOuputElement() { return this.firstOutput; } @@ -97,10 +116,13 @@ suite('Notebook builtin output renderer', () => { } } - function createOutputItem(text: string, mime: string, id: string = '123'): OutputItem { + function createOutputItem(text: string, mime: string, id: string = '123', appendedText?: string): OutputWithAppend { return { id: id, mime: mime, + appendedText() { + return appendedText; + }, text() { return text; }, @@ -146,7 +168,7 @@ suite('Notebook builtin output renderer', () => { const inserted = outputElement.firstChild as HTMLElement; assert.ok(inserted, `nothing appended to output element: ${outputElement.innerHTML}`); - assert.ok(!outputElement.classList.contains('remove-padding'), `Padding should not be removed for non-scrollable outputs: ${outputElement.classList}`); + assert.ok(outputElement.classList.contains('remove-padding'), `Padding should be removed for non-scrollable outputs: ${outputElement.classList}`); assert.ok(!inserted.classList.contains('word-wrap') && !inserted.classList.contains('scrollable'), `output content classList should not contain word-wrap and scrollable ${inserted.classList}`); assert.ok(inserted.innerHTML.indexOf('>content -1, `Content was not added to output element: ${outputElement.innerHTML}`); @@ -158,9 +180,9 @@ suite('Notebook builtin output renderer', () => { assert.ok(renderer, 'Renderer not created'); const outputElement = new OutputHtml().getFirstOuputElement(); - const outputItem = createOutputItem('content', 'text/plain'); + const outputItem = createOutputItem('content', mimeType); await renderer!.renderOutputItem(outputItem, outputElement); - const outputItem2 = createOutputItem('replaced content', 'text/plain'); + const outputItem2 = createOutputItem('replaced content', mimeType); await renderer!.renderOutputItem(outputItem2, outputElement); const inserted = outputElement.firstChild as HTMLElement; @@ -170,6 +192,87 @@ suite('Notebook builtin output renderer', () => { }); + test('Append streaming output', async () => { + const context = createContext({ outputWordWrap: false, outputScrolling: true }); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputElement = new OutputHtml().getFirstOuputElement(); + const outputItem = createOutputItem('content', stdoutMimeType, '123', 'ignoredAppend'); + await renderer!.renderOutputItem(outputItem, outputElement); + const outputItem2 = createOutputItem('content\nappended', stdoutMimeType, '123', '\nappended'); + await renderer!.renderOutputItem(outputItem2, outputElement); + + const inserted = outputElement.firstChild as HTMLElement; + assert.ok(inserted.innerHTML.indexOf('>contentappendedcontentcontent { + const context = createContext({ outputScrolling: true }); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputHtml = new OutputHtml(); + const firstOutputElement = outputHtml.getFirstOuputElement(); + const outputItem1 = createOutputItem('first stream content', stdoutMimeType, '1'); + const outputItem2 = createOutputItem(JSON.stringify(error), errorMimeType, '2'); + const outputItem3 = createOutputItem('second stream content', stdoutMimeType, '3'); + await renderer!.renderOutputItem(outputItem1, firstOutputElement); + const secondOutputElement = outputHtml.appendOutputElement(); + await renderer!.renderOutputItem(outputItem2, secondOutputElement); + const thirdOutputElement = outputHtml.appendOutputElement(); + await renderer!.renderOutputItem(outputItem3, thirdOutputElement); + + const appendedItem1 = createOutputItem('', stdoutMimeType, '1', ' appended1'); + await renderer!.renderOutputItem(appendedItem1, firstOutputElement); + const appendedItem3 = createOutputItem('', stdoutMimeType, '3', ' appended3'); + await renderer!.renderOutputItem(appendedItem3, thirdOutputElement); + + assert.ok(firstOutputElement.innerHTML.indexOf('>first stream content') > -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`); + assert.ok(firstOutputElement.innerHTML.indexOf('appended1') > -1, `Content was not appended to output element: ${outputHtml.cellElement.innerHTML}`); + assert.ok(secondOutputElement.innerHTML.indexOf('>NameError -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`); + assert.ok(thirdOutputElement.innerHTML.indexOf('>second stream content') > -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`); + assert.ok(thirdOutputElement.innerHTML.indexOf('appended3') > -1, `Content was not appended to output element: ${outputHtml.cellElement.innerHTML}`); + }); + + test('Append large streaming outputs', async () => { + const context = createContext({ outputWordWrap: false, outputScrolling: true }); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputElement = new OutputHtml().getFirstOuputElement(); + const lotsOfLines = new Array(4998).fill('line').join('\n'); + const firstOuput = lotsOfLines + 'expected1'; + const outputItem = createOutputItem(firstOuput, stdoutMimeType, '123'); + await renderer!.renderOutputItem(outputItem, outputElement); + const appended = '\n' + lotsOfLines + 'expectedAppend'; + const outputItem2 = createOutputItem(firstOuput + appended, stdoutMimeType, '123', appended); + await renderer!.renderOutputItem(outputItem2, outputElement); + + const inserted = outputElement.firstChild as HTMLElement; + assert.ok(inserted.innerHTML.indexOf('expected1') !== -1, `Last bit of previous content should still exist`); + assert.ok(inserted.innerHTML.indexOf('expectedAppend') !== -1, `Content was not appended to output element`); + }); + + test('Streaming outputs larger than the line limit are truncated', async () => { + const context = createContext({ outputWordWrap: false, outputScrolling: true }); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputElement = new OutputHtml().getFirstOuputElement(); + const lotsOfLines = new Array(11000).fill('line').join('\n'); + const firstOuput = 'shouldBeTruncated' + lotsOfLines + 'expected1'; + const outputItem = createOutputItem(firstOuput, stdoutMimeType, '123'); + await renderer!.renderOutputItem(outputItem, outputElement); + + const inserted = outputElement.firstChild as HTMLElement; + assert.ok(inserted.innerHTML.indexOf('expected1') !== -1, `Last bit of content should exist`); + assert.ok(inserted.innerHTML.indexOf('shouldBeTruncated') === -1, `Beginning content should be truncated`); + }); + test(`Render with wordwrap and scrolling for error output`, async () => { const context = createContext({ outputWordWrap: true, outputScrolling: true }); const renderer = await activate(context); @@ -225,5 +328,125 @@ suite('Notebook builtin output renderer', () => { assert.ok(inserted.innerHTML.indexOf('>second stream content -1, `Content was not added to output element: ${outputElement.innerHTML}`); assert.ok(inserted.innerHTML.indexOf('>third stream content -1, `Content was not added to output element: ${outputElement.innerHTML}`); }); + + test(`Consolidated streaming outputs should replace matching outputs correctly`, async () => { + const context = createContext({ outputScrolling: false }); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputHtml = new OutputHtml(); + const outputElement = outputHtml.getFirstOuputElement(); + const outputItem1 = createOutputItem('first stream content', stdoutMimeType, '1'); + const outputItem2 = createOutputItem('second stream content', stdoutMimeType, '2'); + await renderer!.renderOutputItem(outputItem1, outputElement); + const secondOutput = outputHtml.appendOutputElement(); + await renderer!.renderOutputItem(outputItem2, secondOutput); + const newOutputItem1 = createOutputItem('replaced content', stdoutMimeType, '2'); + await renderer!.renderOutputItem(newOutputItem1, secondOutput); + + + const inserted = outputElement.firstChild as HTMLElement; + assert.ok(inserted, `nothing appended to output element: ${outputElement.innerHTML}`); + assert.ok(inserted.innerHTML.indexOf('>first stream content -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`); + assert.ok(inserted.innerHTML.indexOf('>replaced content -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`); + assert.ok(inserted.innerHTML.indexOf('>second stream content { + const context = createContext({ outputScrolling: true }); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputHtml = new OutputHtml(); + const outputElement = outputHtml.getFirstOuputElement(); + const outputItem1 = createOutputItem('first stream content', stdoutMimeType, '1'); + const outputItem2 = createOutputItem('second stream content', stdoutMimeType, '2'); + await renderer!.renderOutputItem(outputItem1, outputElement); + const secondOutput = outputHtml.appendOutputElement(); + await renderer!.renderOutputItem(outputItem2, secondOutput); + const appendingOutput = createOutputItem('', stdoutMimeType, '2', ' appended'); + await renderer!.renderOutputItem(appendingOutput, secondOutput); + + + const inserted = outputElement.firstChild as HTMLElement; + assert.ok(inserted, `nothing appended to output element: ${outputElement.innerHTML}`); + assert.ok(inserted.innerHTML.indexOf('>first stream content -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`); + assert.ok(inserted.innerHTML.indexOf('>second stream content') > -1, `Second content was not added to ouptut element: ${outputHtml.cellElement.innerHTML}`); + assert.ok(inserted.innerHTML.indexOf('appended') > -1, `Content was not appended to ouptut element: ${outputHtml.cellElement.innerHTML}`); + }); + + test(`Streaming outputs interleaved with other mime types will produce separate outputs`, async () => { + const context = createContext({ outputScrolling: false }); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputHtml = new OutputHtml(); + const firstOutputElement = outputHtml.getFirstOuputElement(); + const outputItem1 = createOutputItem('first stream content', stdoutMimeType, '1'); + const outputItem2 = createOutputItem(JSON.stringify(error), errorMimeType, '2'); + const outputItem3 = createOutputItem('second stream content', stdoutMimeType, '3'); + await renderer!.renderOutputItem(outputItem1, firstOutputElement); + const secondOutputElement = outputHtml.appendOutputElement(); + await renderer!.renderOutputItem(outputItem2, secondOutputElement); + const thirdOutputElement = outputHtml.appendOutputElement(); + await renderer!.renderOutputItem(outputItem3, thirdOutputElement); + + assert.ok(firstOutputElement.innerHTML.indexOf('>first stream content -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`); + assert.ok(secondOutputElement.innerHTML.indexOf('>NameError -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`); + assert.ok(thirdOutputElement.innerHTML.indexOf('>second stream content -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`); + }); + + test(`Multiple adjacent streaming outputs, rerendering the first should erase the rest`, async () => { + const context = createContext(); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputHtml = new OutputHtml(); + const outputElement = outputHtml.getFirstOuputElement(); + const outputItem1 = createOutputItem('first stream content', stdoutMimeType, '1'); + const outputItem2 = createOutputItem('second stream content', stdoutMimeType, '2'); + const outputItem3 = createOutputItem('third stream content', stderrMimeType, '3'); + await renderer!.renderOutputItem(outputItem1, outputElement); + await renderer!.renderOutputItem(outputItem2, outputHtml.appendOutputElement()); + await renderer!.renderOutputItem(outputItem3, outputHtml.appendOutputElement()); + const newOutputItem1 = createOutputItem('replaced content', stderrMimeType, '1'); + await renderer!.renderOutputItem(newOutputItem1, outputElement); + + + const inserted = outputElement.firstChild as HTMLElement; + assert.ok(inserted, `nothing appended to output element: ${outputElement.innerHTML}`); + assert.ok(inserted.innerHTML.indexOf('>replaced content -1, `Content was not added to output element: ${outputElement.innerHTML}`); + assert.ok(inserted.innerHTML.indexOf('>first stream contentsecond stream contentthird stream content { + const context = createContext({ outputWordWrap: false, outputScrolling: true }); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputElement = new OutputHtml().getFirstOuputElement(); + const outputItem = createOutputItem('content', stdoutMimeType); + await renderer!.renderOutputItem(outputItem, outputElement); + fireSettingsChange({ outputWordWrap: true, outputScrolling: true }); + + const inserted = outputElement.firstChild as HTMLElement; + assert.ok(inserted.classList.contains('word-wrap') && inserted.classList.contains('scrollable'), + `output content classList should contain word-wrap and scrollable ${inserted.classList}`); + }); + + test(`Settings event change listeners should not grow if output is re-rendered`, async () => { + const context = createContext({ outputWordWrap: false }); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputElement = new OutputHtml().getFirstOuputElement(); + await renderer!.renderOutputItem(createOutputItem('content', stdoutMimeType), outputElement); + const handlerCount = settingsChangedHandlers.length; + await renderer!.renderOutputItem(createOutputItem('content', stdoutMimeType), outputElement); + + assert.equal(settingsChangedHandlers.length, handlerCount); + }); }); diff --git a/extensions/notebook-renderers/src/textHelper.ts b/extensions/notebook-renderers/src/textHelper.ts index 8cc03fd543e..5cf0e24eb96 100644 --- a/extensions/notebook-renderers/src/textHelper.ts +++ b/extensions/notebook-renderers/src/textHelper.ts @@ -4,9 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import { handleANSIOutput } from './ansi'; - +import { OutputElementOptions, OutputWithAppend } from './rendererTypes'; export const scrollableClass = 'scrollable'; +const softScrollableLineLimit = 5000; +const hardScrollableLineLimit = 8000; + /** * Output is Truncated. View as a [scrollable element] or open in a [text editor]. Adjust cell output [settings...] */ @@ -91,22 +94,70 @@ function truncatedArrayOfString(id: string, buffer: string[], linesLimit: number function scrollableArrayOfString(id: string, buffer: string[], trustHtml: boolean) { const element = document.createElement('div'); - if (buffer.length > 5000) { + if (buffer.length > softScrollableLineLimit) { element.appendChild(generateNestedViewAllElement(id)); } - element.appendChild(handleANSIOutput(buffer.slice(-5000).join('\n'), trustHtml)); + element.appendChild(handleANSIOutput(buffer.slice(-1 * softScrollableLineLimit).join('\n'), trustHtml)); return element; } -export function createOutputContent(id: string, outputs: string[], linesLimit: number, scrollable: boolean, trustHtml: boolean): HTMLElement { +const outputLengths: Record = {}; - const buffer = outputs.join('\n').split(/\r\n|\r|\n/g); - - if (scrollable) { - return scrollableArrayOfString(id, buffer, trustHtml); - } else { - return truncatedArrayOfString(id, buffer, linesLimit, trustHtml); +function appendScrollableOutput(element: HTMLElement, id: string, appended: string, trustHtml: boolean) { + if (!outputLengths[id]) { + outputLengths[id] = 0; } + + const buffer = appended.split(/\r\n|\r|\n/g); + const appendedLength = buffer.length + outputLengths[id]; + // Only append outputs up to the hard limit of lines, then replace it with the last softLimit number of lines + if (appendedLength > hardScrollableLineLimit) { + return false; + } + else { + element.appendChild(handleANSIOutput(buffer.join('\n'), trustHtml)); + outputLengths[id] = appendedLength; + } + return true; } + +export function createOutputContent(id: string, outputText: string, options: OutputElementOptions): HTMLElement { + const { linesLimit, error, scrollable, trustHtml } = options; + const buffer = outputText.split(/\r\n|\r|\n/g); + outputLengths[id] = outputLengths[id] = Math.min(buffer.length, softScrollableLineLimit); + + let outputElement: HTMLElement; + if (scrollable) { + outputElement = scrollableArrayOfString(id, buffer, !!trustHtml); + } else { + outputElement = truncatedArrayOfString(id, buffer, linesLimit, !!trustHtml); + } + + outputElement.setAttribute('output-item-id', id); + if (error) { + outputElement.classList.add('error'); + } + + return outputElement; +} + +export function appendOutput(outputInfo: OutputWithAppend, existingContent: HTMLElement, options: OutputElementOptions) { + const appendedText = outputInfo.appendedText?.(); + // appending output only supported for scrollable ouputs currently + if (appendedText && options.scrollable) { + if (appendScrollableOutput(existingContent, outputInfo.id, appendedText, false)) { + return; + } + } + + const newContent = createOutputContent(outputInfo.id, outputInfo.text(), options); + existingContent.replaceWith(newContent); + while (newContent.nextSibling) { + // clear out any stale content if we had previously combined streaming outputs into this one + newContent.nextSibling.remove(); + } + +} + diff --git a/extensions/notebook-renderers/yarn.lock b/extensions/notebook-renderers/yarn.lock index ba3ff6b48d9..fac17bd8f60 100644 --- a/extensions/notebook-renderers/yarn.lock +++ b/extensions/notebook-renderers/yarn.lock @@ -334,9 +334,9 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== tough-cookie@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" - integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== dependencies: psl "^1.1.33" punycode "^2.1.1" diff --git a/extensions/npm/src/tasks.ts b/extensions/npm/src/tasks.ts index 7bd6b1a2b14..17bb815f962 100644 --- a/extensions/npm/src/tasks.ts +++ b/extensions/npm/src/tasks.ts @@ -140,7 +140,7 @@ export async function getPackageManager(extensionContext: ExtensionContext, fold window.showInformationMessage(multiplePMWarning, learnMore, neverShowAgain).then(result => { switch (result) { case neverShowAgain: extensionContext.globalState.update(neverShowWarning, true); break; - case learnMore: env.openExternal(Uri.parse('https://nodejs.dev/learn/the-package-lock-json-file')); + case learnMore: env.openExternal(Uri.parse('https://docs.npmjs.com/cli/v9/configuring-npm/package-lock-json')); } }); } diff --git a/extensions/package.json b/extensions/package.json index 5d6cb795bcd..32f5bc84b98 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -4,7 +4,7 @@ "license": "MIT", "description": "Dependencies shared by all extensions", "dependencies": { - "typescript": "^5.1.0-dev.20230515" + "typescript": "^5.2.0-dev.20230731" }, "scripts": { "postinstall": "node ./postinstall.mjs" diff --git a/extensions/perl/package.json b/extensions/perl/package.json index 8e3fed18d0c..3357e1ff3bd 100644 --- a/extensions/perl/package.json +++ b/extensions/perl/package.json @@ -9,7 +9,7 @@ "vscode": "*" }, "scripts": { - "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/perl.tmbundle Syntaxes/Perl.plist ./syntaxes/perl.tmLanguage.json Syntaxes/Perl%206.tmLanguage ./syntaxes/perl6.tmLanguage.json" + "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/perl.tmbundle Syntaxes/Perl.plist ./syntaxes/perl.tmLanguage.json Syntaxes/Perl%%206.tmLanguage ./syntaxes/perl6.tmLanguage.json" }, "contributes": { "languages": [ diff --git a/extensions/php/cgmanifest.json b/extensions/php/cgmanifest.json index 4fe8f5ebcb5..02faac2b0c0 100644 --- a/extensions/php/cgmanifest.json +++ b/extensions/php/cgmanifest.json @@ -5,12 +5,12 @@ "type": "git", "git": { "name": "language-php", - "repositoryUrl": "https://github.com/atom/language-php", - "commitHash": "eb28b8aea1214dcbc732f3d9b9ed20c089c648bd" + "repositoryUrl": "https://github.com/KapitanOczywisty/language-php", + "commitHash": "5e8f000cb5a20f44f7a7a89d07ad0774031c53f3" } }, "license": "MIT", - "version": "0.48.1" + "version": "0.49.0" } ], "version": 1 diff --git a/extensions/php/language-configuration.json b/extensions/php/language-configuration.json index e585ebf1c91..f44d7a25cb6 100644 --- a/extensions/php/language-configuration.json +++ b/extensions/php/language-configuration.json @@ -76,6 +76,15 @@ "indent": "none", "removeText": 1 } + }, + { + // Decrease indentation after single line if/else if/else, for, foreach, or while + "previousLineText": "^\\s*(((else ?)?if|for(each)?|while)\\s*\\(.*\\)\\s*|else\\s*)$", + // But make sure line doesn't have braces or is not another if statement + "beforeText": "^\\s+([^{i\\s]|i(?!f\\b))", + "action": { + "indent": "outdent" + } } ] } diff --git a/extensions/php/snippets/php.code-snippets b/extensions/php/snippets/php.code-snippets index 3c213765b4b..5cc31f19661 100644 --- a/extensions/php/snippets/php.code-snippets +++ b/extensions/php/snippets/php.code-snippets @@ -1,8 +1,66 @@ { + "$ā€¦ = ( ā€¦ ) ? ā€¦ : ā€¦": { + "prefix": "if?", + "body": "$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b} ;", + "description": "Ternary conditional assignment" + }, + "$ā€¦ = array (ā€¦)": { + "prefix": "array", + "body": "$${1:arrayName} = array($0);", + "description": "Array initializer" + }, + "$ā€¦ = [ā€¦]": { + "prefix": "shorray", + "body": "$${1:arrayName} = [$0];", + "description": "Array initializer" + }, + "ā€¦ => ā€¦": { + "prefix": "keyval,kvp", + "body": "'$1' => $2$0", + "description": "Key-Value pair" + }, + "$a <=> $b": { + "prefix": "spaceship", + "body": "(${1:$$a} <=> ${2:$$b} === ${3|0,1,-1|})", + "description": "Spaceship equality check" + }, + "attribute": { + "prefix": "attr", + "body": [ + "#[\\\\Attribute]", + "class ${1:My}Attribute${2: extends ${3:MyOther}Attribute} {", + "\t$0", + "}" + ], + "description": "Attribute" + }, + "attribute target": { + "prefix": "attr_target", + "body": "\\Attribute::${1|TARGET_ALL,TARGET_CLASS,TARGET_FUNCTION,TARGET_METHOD,TARGET_PROPERTY,TARGET_CLASS_CONSTANT,TARGET_PARAMETER,IS_REPEATABLE|}$0" + }, + "attribute with target": { + "prefix": "attr_with_target", + "body": [ + "#[\\\\Attribute(\\Attribute::${1|TARGET_ALL,TARGET_CLASS,TARGET_FUNCTION,TARGET_METHOD,TARGET_PROPERTY,TARGET_CLASS_CONSTANT,TARGET_PARAMETER,IS_REPEATABLE|}$2)]", + "class ${3:My}Attribute${4: extends ${5:MyOther}Attribute} {", + "\t$0", + "}" + ], + "description": "Attribute - Chain targets with attr_target snippet" + }, + "case ā€¦": { + "prefix": "case", + "body": [ + "case '${1:value}':", + "\t${0:# code...}", + "\tbreak;" + ], + "description": "Case Block" + }, "class ā€¦": { "prefix": "class", "body": [ - "class ${1:ClassName} ${2:extends ${3:AnotherClass}} ${4:implements ${5:Interface}}", + "${1:${2|final ,readonly |}}class ${3:${TM_FILENAME_BASE}}${4: extends ${5:AnotherClass}} ${6:implements ${7:Interface}}", "{", "\t$0", "}", @@ -10,87 +68,36 @@ ], "description": "Class definition" }, - "PHPDoc class ā€¦": { - "prefix": "doc_class", - "isFileTemplate": true, + "class __construct": { + "prefix": "construct", "body": [ - "/**", - " * ${6:undocumented class}", - " */", - "class ${1:ClassName} ${2:extends ${3:AnotherClass}} ${4:implements ${5:Interface}}", - "{", - "\t$0", - "}", - "" - ], - "description": "Documented Class Declaration" - }, - "function __construct": { - "prefix": "con", - "body": [ - "${1:public} function __construct(${2:${3:Type} $${4:var}${5: = ${6:null}}}) {", - "\t\\$this->${4:var} = $${4:var};$0", - "}" + "${1|public,private,protected|} function __construct(${2:${3:Type} $${4:var}${5: = ${6:null}}}$7) {", + "\t\\$this->${4:var} = $${4:var};$0", + "}" ] }, - "PHPDoc property": { - "prefix": "doc_v", + "class function ā€¦": { + "prefix": "class_fun", "body": [ - "/** @var ${1:Type} $${2:var} ${3:description} */", - "${4:protected} $${2:var}${5: = ${6:null}};$0" - ], - "description": "Documented Class Variable" - }, - "PHPDoc function ā€¦": { - "prefix": "doc_f", - "isFileTemplate": true, - "body": [ - "/**", - " * ${1:undocumented function summary}", - " *", - " * ${2:Undocumented function long description}", - " *", - "${3: * @param ${4:Type} $${5:var} ${6:Description}}", - "${7: * @return ${8:type}}", - "${9: * @throws ${10:conditon}}", - " **/", - "${11:public }function ${12:FunctionName}(${13:${14:${4:Type} }$${5:var}${15: = ${16:null}}})", + "${1|public ,private ,protected |}${2: static }function ${3:FunctionName}(${4:${5:${6:Type} }$${7:var}${8: = ${9:null}}}$10) : ${11:Returntype}", "{", "\t${0:# code...}", "}" ], - "description": "Documented function" + "description": "Function for classes, traits and enums" }, - "PHPDoc param ā€¦": { - "prefix": "param", - "body": [ - "* @param ${1:Type} ${2:var} ${3:Description}$0" - ], - "description": "Parameter documentation" + "const": { + "prefix": "const", + "body": "${1|public ,private ,protected |}const ${2:NAME} = $3;", + "description": "Constant for classes, traits, enums" }, - "function ā€¦": { - "prefix": "fun", + "enum": { + "prefix": "enum", "body": [ - "${1:public }function ${2:FunctionName}(${3:${4:${5:Type} }$${6:var}${7: = ${8:null}}})", - "{", - "\t${0:# code...}", + "enum $1 {", + "\tcase $2;$0", "}" - ], - "description": "Function" - }, - "trait ā€¦": { - "prefix": "trait", - "body": [ - "/**", - " * $1", - " */", - "trait ${2:TraitName}", - "{", - "\t$0", - "}", - "" - ], - "description": "Trait" + ] }, "define(ā€¦, ā€¦)": { "prefix": "def", @@ -108,41 +115,6 @@ "} while (${1:$${2:a} <= ${3:10}});" ], "description": "Do-While loop" - }, - "while ā€¦": { - "prefix": "while", - "body": [ - "while (${1:$${2:a} <= ${3:10}}) {", - "\t${0:# code...}", - "}" - ], - "description": "While-loop" - }, - "if ā€¦": { - "prefix": "if", - "body": [ - "if (${1:condition}) {", - "\t${0:# code...}", - "}" - ], - "description": "If block" - }, - "if ā€¦ else ā€¦": { - "prefix": "ifelse", - "body": [ - "if (${1:condition}) {", - "\t${2:# code...}", - "} else {", - "\t${3:# code...}", - "}", - "$0" - ], - "description": "If Else block" - }, - "$ā€¦ = ( ā€¦ ) ? ā€¦ : ā€¦": { - "prefix": "if?", - "body": "$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b} ;", - "description": "Ternary conditional assignment" }, "else ā€¦": { "prefix": "else", @@ -174,26 +146,146 @@ "foreach ā€¦": { "prefix": "foreach", "body": [ - "foreach ($${1:variable} as $${2:key} ${3:=> $${4:value}}) {", + "foreach ($${1:variable} as $${2:key}${3: => $${4:value}}) {", "\t${0:# code...}", "}" ], "description": "Foreach loop" }, - "$ā€¦ = array (ā€¦)": { - "prefix": "array", - "body": "$${1:arrayName} = array('$2' => $3${4:,} $0);", - "description": "Array initializer" + "function": { + "prefix": "fun", + "body": [ + "function ${1:FunctionName}($2)${3: : ${4:Returntype}} {", + "\t$0", + "}" + ], + "description": "Function - use param snippet for parameters" }, - "$ā€¦ = [ā€¦]": { - "prefix": "shorray", - "body": "$${1:arrayName} = ['$2' => $3${4:,} $0];", - "description": "Array initializer" + "anonymous function": { + "prefix": "fun_anonymous", + "body": [ + "function ($1)${2: use ($${3:var})} {", + "\t$0", + "}" + ], + "description": "Anonymous Function" }, - "ā€¦ => ā€¦": { - "prefix": "keyval", - "body": "'$1' => $2${3:,} $0", - "description": "Key-Value initializer" + "if ā€¦": { + "prefix": "if", + "body": [ + "if (${1:condition}) {", + "\t${0:# code...}", + "}" + ], + "description": "If block" + }, + "if ā€¦ else ā€¦": { + "prefix": "ifelse", + "body": [ + "if (${1:condition}) {", + "\t${2:# code...}", + "} else {", + "\t${3:# code...}", + "}", + "$0" + ], + "description": "If Else block" + }, + "match": { + "prefix": "match", + "body": [ + "match (${1:expression}) {", + "\t$2 => $3,", + "\t$4 => $5,$0", + "}" + ], + "description": "Match expression; like switch with identity checks. Use keyval snippet to chain expressions" + }, + "param": { + "prefix": "param", + "body": "${1:Type} $${2:var}${3: = ${4:null}}$5", + "description": "Parameter definition" + }, + "property": { + "prefix": "property", + "body": "${1|public ,private ,protected |}${2|static ,readonly |}${3:Type} $${4:var}${5: = ${6:null}};$0", + "description": "Property" + }, + "PHPDoc class ā€¦": { + "prefix": "doc_class", + "body": [ + "/**", + " * ${8:undocumented class}", + " */", + "${1:${2|final ,readonly |}}class ${3:${TM_FILENAME_BASE}}${4: extends ${5:AnotherClass}} ${6:implements ${7:Interface}}", + "{", + "\t$0", + "}", + "" + ], + "description": "Documented Class Declaration" + }, + "PHPDoc function ā€¦": { + "prefix": "doc_fun", + "body": [ + "/**", + " * ${1:undocumented function summary}", + " *", + " * ${2:Undocumented function long description}", + " *", + "${3: * @param ${4:Type} $${5:var} ${6:Description}}", + "${7: * @return ${8:type}}", + "${9: * @throws ${10:conditon}}", + " **/", + "${11:public }function ${12:FunctionName}(${13:${14:${4:Type} }$${5:var}${15: = ${16:null}}}17)", + "{", + "\t${0:# code...}", + "}" + ], + "description": "Documented function" + }, + "PHPDoc param ā€¦": { + "prefix": "doc_param", + "body": [ + "* @param ${1:Type} ${2:var} ${3:Description}$0" + ], + "description": "Paramater documentation" + }, + "PHPDoc trait": { + "prefix": "doc_trait", + "body": [ + "/**", + " * $1", + " */", + "trait ${2:TraitName}", + "{", + "\t$0", + "}", + "" + ], + "description": "Trait" + }, + "PHPDoc var": { + "prefix": "doc_var", + "body": [ + "/** @var ${1:Type} $${2:var} ${3:description} */", + "${4:protected} $${2:var}${5: = ${6:null}};$0" + ], + "description": "Documented Class Variable" + }, + "Region End": { + "prefix": "#endregion", + "body": [ + "#endregion" + ], + "description": "Folding Region End" + }, + "Region Start": { + "prefix": "#region", + "body": [ + "#region" + ], + "description": "Folding Region Start" }, "switch ā€¦": { "prefix": "switch", @@ -210,25 +302,11 @@ ], "description": "Switch block" }, - "case ā€¦": { - "prefix": "case", - "body": [ - "case '${1:value}':", - "\t${0:# code...}", - "\tbreak;" - ], - "description": "Case Block" - }, "$this->ā€¦": { "prefix": "this", "body": "\\$this->$0;", "description": "$this->..." }, - "echo $this->ā€¦": { - "prefix": "ethis", - "body": "echo \\$this->$0;", - "description": "Echo this" - }, "Throw Exception": { "prefix": "throw", "body": [ @@ -237,19 +315,16 @@ ], "description": "Throw exception" }, - "Region Start": { - "prefix": "#region", + "trait ā€¦": { + "prefix": "trait", "body": [ - "#region" + "trait ${1:TraitName}", + "{", + "\t$0", + "}", + "" ], - "description": "Folding Region Start" - }, - "Region End": { - "prefix": "#endregion", - "body": [ - "#endregion" - ], - "description": "Folding Region End" + "description": "Trait" }, "Try Catch Block": { "prefix": "try", @@ -261,5 +336,36 @@ "}" ], "description": "Try catch block" + }, + "use function": { + "prefix": "use_fun", + "body": "use function $1;" + }, + "use const": { + "prefix": "use_const", + "body": "use const $1;" + }, + "use grouping": { + "prefix": "use_group", + "body": [ + "use${1| const , function |}$2\\{", + "\t$0,", + "}" + ], + "description": "Use grouping imports" + }, + "use as ": { + "prefix": "use_as", + "body": "use${1| const , function |}$2 as $3;", + "description": "Use as alias" + }, + "while ā€¦": { + "prefix": "while", + "body": [ + "while (${1:$${2:a} <= ${3:10}}) {", + "\t${0:# code...}", + "}" + ], + "description": "While-loop" } } diff --git a/extensions/razor/cgmanifest.json b/extensions/razor/cgmanifest.json index 04a1078be19..799e12cf325 100644 --- a/extensions/razor/cgmanifest.json +++ b/extensions/razor/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "dotnet/razor", "repositoryUrl": "https://github.com/dotnet/razor", - "commitHash": "8d0ae9664cb27276eab36d83e48e88356468ca67" + "commitHash": "69f60231df08319b544d3d32a588575acbb58ff0" } }, "license": "MIT", diff --git a/extensions/razor/syntaxes/cshtml.tmLanguage.json b/extensions/razor/syntaxes/cshtml.tmLanguage.json index 9293a6de060..0b5463ee3ca 100644 --- a/extensions/razor/syntaxes/cshtml.tmLanguage.json +++ b/extensions/razor/syntaxes/cshtml.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/dotnet/razor/commit/8d0ae9664cb27276eab36d83e48e88356468ca67", + "version": "https://github.com/dotnet/razor/commit/69f60231df08319b544d3d32a588575acbb58ff0", "name": "ASP.NET Razor", "scopeName": "text.html.cshtml", "patterns": [ @@ -531,7 +531,7 @@ ] }, "code-directive": { - "begin": "(@)(code)\\s*", + "begin": "(@)(code)((?=\\{)|\\s+)", "beginCaptures": { "1": { "patterns": [ @@ -552,7 +552,7 @@ "end": "(?<=})|\\s" }, "functions-directive": { - "begin": "(@)(functions)\\s*", + "begin": "(@)(functions)((?=\\{)|\\s+)", "beginCaptures": { "1": { "patterns": [ diff --git a/extensions/references-view/src/calls/model.ts b/extensions/references-view/src/calls/model.ts index 30d320355aa..087e577b160 100644 --- a/extensions/references-view/src/calls/model.ts +++ b/extensions/references-view/src/calls/model.ts @@ -177,7 +177,7 @@ class CallItemDataProvider implements vscode.TreeDataProvider { const item = new vscode.TreeItem(element.item.name); item.description = element.item.detail; - item.tooltip = item.label ? `${item.label} - ${element.item.detail}` : element.item.detail; + item.tooltip = item.label && element.item.detail ? `${item.label} - ${element.item.detail}` : item.label ? `${item.label}` : element.item.detail; item.contextValue = 'call-item'; item.iconPath = getThemeIcon(element.item.kind); diff --git a/extensions/references-view/src/highlights.ts b/extensions/references-view/src/highlights.ts index e50ef4bed28..fff533fa176 100644 --- a/extensions/references-view/src/highlights.ts +++ b/extensions/references-view/src/highlights.ts @@ -23,7 +23,11 @@ export class EditorHighlights { vscode.workspace.onDidChangeTextDocument(e => this._ignore.add(e.document.uri.toString())), vscode.window.onDidChangeActiveTextEditor(() => _view.visible && this.update()), _view.onDidChangeVisibility(e => e.visible ? this._show() : this._hide()), - _view.onDidChangeSelection(() => _view.visible && this.update()) + _view.onDidChangeSelection(() => { + if (_view.visible) { + this.update(); + } + }) ); this._show(); } diff --git a/extensions/references-view/src/navigation.ts b/extensions/references-view/src/navigation.ts index fdb7dc64881..e592dfbf7ea 100644 --- a/extensions/references-view/src/navigation.ts +++ b/extensions/references-view/src/navigation.ts @@ -18,7 +18,6 @@ export class Navigation { this._disposables.push( vscode.commands.registerCommand('references-view.next', () => this.next(false)), vscode.commands.registerCommand('references-view.prev', () => this.previous(false)), - _view.onDidChangeSelection(() => this._ensureSelectedElementIsVisible()), ); } @@ -31,20 +30,6 @@ export class Navigation { this._ctxCanNavigate.set(Boolean(this._delegate)); } - private _ensureSelectedElementIsVisible(): void { - if (this._view.selection.length === 0) { - return; - } - const [item] = this._view.selection; - const location = this._delegate?.location(item); - if (!location) { - return; - } - if (vscode.window.activeTextEditor?.document.uri.toString() !== location.uri.toString()) { - this._open(location, true); - } - } - private _anchor(): undefined | unknown { if (!this._delegate) { return undefined; diff --git a/extensions/search-result/src/extension.ts b/extensions/search-result/src/extension.ts index 90443f16771..815bd8c1391 100644 --- a/extensions/search-result/src/extension.ts +++ b/extensions/search-result/src/extension.ts @@ -78,7 +78,7 @@ export function activate(context: vscode.ExtensionContext) { const lineResult = parseSearchResults(document, token)[position.line]; if (!lineResult) { return []; } if (lineResult.type === 'file') { - return lineResult.allLocations; + return lineResult.allLocations.map(l => ({ ...l, originSelectionRange: lineResult.location.originSelectionRange })); } const location = lineResult.locations.find(l => l.originSelectionRange.contains(position)); diff --git a/extensions/shellscript/cgmanifest.json b/extensions/shellscript/cgmanifest.json index 87be4976392..f246d45fe21 100644 --- a/extensions/shellscript/cgmanifest.json +++ b/extensions/shellscript/cgmanifest.json @@ -6,11 +6,11 @@ "git": { "name": "jeff-hykin/better-shell-syntax", "repositoryUrl": "https://github.com/jeff-hykin/better-shell-syntax", - "commitHash": "1bad17d8badf6283125aaa7c31be06ba64146a0f" + "commitHash": "ce62ea59e8e522f8a07d8d8a2d1f992c6c600b91" } }, "license": "MIT", - "version": "1.5.4" + "version": "1.6.2" } ], "version": 1 diff --git a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json index e132b9e5699..68055eb7b29 100644 --- a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json +++ b/extensions/shellscript/syntaxes/shell-unix-bash.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/jeff-hykin/better-shell-syntax/commit/1bad17d8badf6283125aaa7c31be06ba64146a0f", + "version": "https://github.com/jeff-hykin/better-shell-syntax/commit/ce62ea59e8e522f8a07d8d8a2d1f992c6c600b91", "name": "Shell Script", "scopeName": "source.shell", "patterns": [ @@ -14,7 +14,7 @@ ], "repository": { "alias_statement": { - "begin": "(alias)[ \\t]*+[ \\t]*+(?:((?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$))[ \\t]*+)?((?|#|\\n|$|;|[ \\t]))(?!foreach\\b(?!\\/)|select\\b(?!\\/)|repeat\\b(?!\\/)|until\\b(?!\\/)|while\\b(?!\\/)|case\\b(?!\\/)|done\\b(?!\\/)|elif\\b(?!\\/)|else\\b(?!\\/)|esac\\b(?!\\/)|then\\b(?!\\/)|for\\b(?!\\/)|end\\b(?!\\/)|in\\b(?!\\/)|fi\\b(?!\\/)|do\\b(?!\\/)|if\\b(?!\\/))(?:((?<=^|;|&|[ \\t])(?:export|declare|typeset|local|readonly)(?=[ \\t]|;|&|$))|((?!\"|'|\\\\\\n?$)[^!'\" \\t\\n\\r]+?))(?:(?= |\\t)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?|#|\\n|$|;|[ \\t]))(?!foreach\\b(?!\\/)|select\\b(?!\\/)|repeat\\b(?!\\/)|until\\b(?!\\/)|while\\b(?!\\/)|case\\b(?!\\/)|done\\b(?!\\/)|elif\\b(?!\\/)|else\\b(?!\\/)|esac\\b(?!\\/)|then\\b(?!\\/)|for\\b(?!\\/)|end\\b(?!\\/)|in\\b(?!\\/)|fi\\b(?!\\/)|do\\b(?!\\/)|if\\b(?!\\/))(?:((?<=^|;|&|[ \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t]|;|&|$))|((?!\"|'|\\\\\\n?$)[^!'\" \\t\\n\\r]+?))(?:(?= |\\t)|(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?= 0; - -let outputRoot = __dirname; -const outputRootIndex = args.indexOf('--outputRoot'); -if (outputRootIndex >= 0) { - outputRoot = args[outputRootIndex + 1]; -} const srcDir = path.join(__dirname, 'preview-src'); -const outDir = path.join(outputRoot, 'media'); +const outDir = path.join(__dirname, 'media'); -async function build() { - await esbuild.build({ - entryPoints: { - 'index': path.join(srcDir, 'index.ts'), - 'codicon': path.join(__dirname, 'node_modules', 'vscode-codicons', 'dist', 'codicon.css'), - }, +require('../esbuild-webview-common').run({ + entryPoints: { + 'index': path.join(srcDir, 'index.ts'), + 'codicon': path.join(__dirname, 'node_modules', 'vscode-codicons', 'dist', 'codicon.css'), + }, + srcDir, + outdir: outDir, + additionalOptions: { loader: { '.ttf': 'dataurl', - }, - bundle: true, - minify: true, - sourcemap: false, - format: 'esm', - outdir: outDir, - platform: 'browser', - target: ['es2020'], - }); -} - -build().catch(() => process.exit(1)); - -if (isWatch) { - const watcher = require('@parcel/watcher'); - watcher.subscribe(srcDir, () => { - return build(); - }); -} + } + } +}, process.argv); diff --git a/extensions/simple-browser/src/simpleBrowserView.ts b/extensions/simple-browser/src/simpleBrowserView.ts index eb842f6f104..5725dcf4f9b 100644 --- a/extensions/simple-browser/src/simpleBrowserView.ts +++ b/extensions/simple-browser/src/simpleBrowserView.ts @@ -165,7 +165,7 @@ export class SimpleBrowserView extends Disposable {
${vscode.l10n.t("Focus Lock")}
- +
diff --git a/extensions/simple-browser/yarn.lock b/extensions/simple-browser/yarn.lock index 58a6ddf8cdf..e57ce16ff44 100644 --- a/extensions/simple-browser/yarn.lock +++ b/extensions/simple-browser/yarn.lock @@ -323,9 +323,9 @@ ms@2.1.2: integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== semver@^5.3.0, semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== shimmer@^1.1.0, shimmer@^1.2.0: version "1.2.1" diff --git a/extensions/sql/cgmanifest.json b/extensions/sql/cgmanifest.json index da31bda5d03..732474f0dc5 100644 --- a/extensions/sql/cgmanifest.json +++ b/extensions/sql/cgmanifest.json @@ -6,11 +6,11 @@ "git": { "name": "microsoft/vscode-mssql", "repositoryUrl": "https://github.com/microsoft/vscode-mssql", - "commitHash": "3929516cce0a570e91ee1be74b09ed886cb360f4" + "commitHash": "9cb3529a978ddf599bf5bdd228f21bbcfe2914f5" } }, "license": "MIT", - "version": "1.19.0" + "version": "1.20.0" } ], "version": 1 diff --git a/extensions/sql/language-configuration.json b/extensions/sql/language-configuration.json index 6878d8ca72f..7911ff4f6c8 100644 --- a/extensions/sql/language-configuration.json +++ b/extensions/sql/language-configuration.json @@ -25,6 +25,7 @@ ["`", "`"] ], "folding": { + "offSide": true, "markers": { "start": "^\\s*--\\s*#region\\b", "end": "^\\s*--\\s*#endregion\\b" diff --git a/extensions/sql/syntaxes/sql.tmLanguage.json b/extensions/sql/syntaxes/sql.tmLanguage.json index 2b18a9c4356..ba6fac58192 100644 --- a/extensions/sql/syntaxes/sql.tmLanguage.json +++ b/extensions/sql/syntaxes/sql.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/vscode-mssql/commit/3929516cce0a570e91ee1be74b09ed886cb360f4", + "version": "https://github.com/microsoft/vscode-mssql/commit/9cb3529a978ddf599bf5bdd228f21bbcfe2914f5", "name": "SQL", "scopeName": "source.sql", "patterns": [ @@ -372,7 +372,7 @@ "include": "#regexps" }, { - "match": "\\b(?i)(abort|abort_after_wait|absent|absolute|accent_sensitivity|acceptable_cursopt|acp|action|activation|add|address|admin|aes_128|aes_192|aes_256|affinity|after|aggregate|algorithm|all_constraints|all_errormsgs|all_indexes|all_levels|all_results|allow_connections|allow_dup_row|allow_encrypted_value_modifications|allow_page_locks|allow_row_locks|allow_snapshot_isolation|alter|altercolumn|always|anonymous|ansi_defaults|ansi_null_default|ansi_null_dflt_off|ansi_null_dflt_on|ansi_nulls|ansi_padding|ansi_warnings|appdomain|append|application|apply|arithabort|arithignore|array|assembly|asymmetric|asynchronous_commit|at|atan2|atomic|attach|attach_force_rebuild_log|attach_rebuild_log|audit|auth_realm|authentication|auto|auto_cleanup|auto_close|auto_create_statistics|auto_drop|auto_shrink|auto_update_statistics|auto_update_statistics_async|automated_backup_preference|automatic|autopilot|availability|availability_mode|backup|backup_priority|base64|basic|batches|batchsize|before|between|bigint|binary|binding|bit|block|blockers|blocksize|bmk|both|break|broker|broker_instance|bucket_count|buffer|buffercount|bulk_logged|by|call|caller|card|case|catalog|catch|cert|certificate|change_retention|change_tracking|change_tracking_context|changes|char|character|character_set|check_expiration|check_policy|checkconstraints|checkindex|checkpoint|checksum|cleanup_policy|clear|clear_port|close|clustered|codepage|collection|column_encryption_key|column_master_key|columnstore|columnstore_archive|colv_80_to_100|colv_100_to_80|commit_differential_base|committed|compatibility_level|compress_all_row_groups|compression|compression_delay|concat_null_yields_null|concatenate|configuration|connect|continue|continue_after_error|contract|contract_name|control|conversation|conversation_group_id|conversation_handle|copy|copy_only|count_rows|counter|create(\\\\s+or\\\\s+alter)?|credential|cross|cryptographic|cryptographic_provider|cube|cursor|cursor_close_on_commit|cursor_default|data|data_compression|data_flush_interval_seconds|data_mirroring|data_purity|data_source|database|database_name|database_snapshot|datafiletype|date_correlation_optimization|date|datefirst|dateformat|date_format|datetime|datetime2|datetimeoffset|day(s)?|db_chaining|dbid|dbidexec|dbo_only|deadlock_priority|deallocate|dec|decimal|declare|decrypt|decrypt_a|decryption|default_database|default_language|default_logon_domain|default_schema|definition|delay|delayed_durability|delimitedtext|density_vector|dependent|des|description|desired_state|desx|differential|digest|disable|disable_broker|disable_def_cnst_chk|disabled|disk|distinct|distributed|distribution|drop|drop_existing|dts_buffers|dump|durability|dynamic|edition|elements|else|emergency|empty|enable|enable_broker|enabled|encoding|encrypted|encrypted_value|encryption|encryption_type|end|endpoint|endpoint_url|enhancedintegrity|entry|error_broker_conversations|errorfile|estimateonly|event|except|exec|executable|execute|exists|expand|expiredate|expiry_date|explicit|external|external_access|failover|failover_mode|failure_condition_level|fast|fast_forward|fastfirstrow|federated_service_account|fetch|field_terminator|fieldterminator|file|filelistonly|filegroup|filename|filestream|filestream_log|filestream_on|filetable|file_format|filter|first_row|fips_flagger|fire_triggers|first|firstrow|float|flush_interval_seconds|fmtonly|following|force|force_failover_allow_data_loss|force_service_allow_data_loss|forced|forceplan|formatfile|format_options|format_type|formsof|forward_only|free_cursors|free_exec_context|fullscan|fulltext|fulltextall|fulltextkey|function|generated|get|geography|geometry|global|go|goto|governor|guid|hadoop|hardening|hash|hashed|header_limit|headeronly|health_check_timeout|hidden|hierarchyid|histogram|histogram_steps|hits_cursors|hits_exec_context|hour(s)?|http|identity|identity_value|if|ifnull|ignore|ignore_constraints|ignore_dup_key|ignore_dup_row|ignore_triggers|image|immediate|implicit_transactions|include|include_null_values|index|inflectional|init|initiator|insensitive|insert|instead|int|integer|integrated|intersect|intermediate|interval_length_minutes|into|inuse_cursors|inuse_exec_context|io|is|isabout|iso_week|isolation|job_tracker_location|json|keep|keep_nulls|keep_replication|keepdefaults|keepfixed|keepidentity|keepnulls|kerberos|key|key_path|key_source|key_store_provider_name|keyset|kill|kilobytes_per_batch|labelonly|langid|language|last|lastrow|leading|legacy_cardinality_estimation|length|level|lifetime|lineage_80_to_100|lineage_100_to_80|listener_ip|listener_port|load|loadhistory|lob_compaction|local|local_service_name|locate|location|lock_escalation|lock_timeout|lockres|log|login|login_type|loop|manual|mark_in_use_for_removal|masked|master|matched|max_queue_readers|max_duration|max_outstanding_io_per_volume|maxdop|maxerrors|maxlength|maxtransfersize|max_plans_per_query|max_storage_size_mb|mediadescription|medianame|mediapassword|memogroup|memory_optimized|merge|message|message_forward_size|message_forwarding|microsecond|millisecond|minute(s)?|mirror_address|misses_cursors|misses_exec_context|mixed|modify|money|month|move|multi_user|must_change|name|namespace|nanosecond|native|native_compilation|nchar|ncharacter|never|new_account|new_broker|newname|next|no|no_browsetable|no_checksum|no_compression|no_infomsgs|no_triggers|no_truncate|nocount|noexec|noexpand|noformat|noinit|nolock|nonatomic|nonclustered|nondurable|none|norecompute|norecovery|noreset|norewind|noskip|not|notification|nounload|now|nowait|ntext|ntlm|nulls|numeric|numeric_roundabort|nvarchar|object|objid|oem|offline|old_account|online|operation_mode|open|openjson|optimistic|option|orc|out|outer|output|over|override|owner|ownership|pad_index|page|page_checksum|page_verify|pagecount|paglock|param|parameter_sniffing|parameter_type_expansion|parameterization|parquet|parseonly|partial|partition|partner|password|path|pause|percentage|permission_set|persisted|period|physical_only|plan_forcing_mode|policy|pool|population|ports|preceding|precision|predicate|presume_abort|primary|primary_role|print|prior|priority |priority_level|private|proc(edure)?|procedure_name|profile|provider|quarter|query_capture_mode|query_governor_cost_limit|query_optimizer_hotfixes|query_store|queue|quoted_identifier|raiserror|range|raw|rcfile|rc2|rc4|rc4_128|rdbms|read_committed_snapshot|read|read_only|read_write|readcommitted|readcommittedlock|readonly|readpast|readuncommitted|readwrite|real|rebuild|receive|recmodel_70backcomp|recompile|reconfigure|recovery|recursive|recursive_triggers|redo_queue|reject_sample_value|reject_type|reject_value|relative|remote|remote_data_archive|remote_proc_transactions|remote_service_name|remove|removed_cursors|removed_exec_context|reorganize|repeat|repeatable|repeatableread|replace|replica|replicated|replnick_100_to_80|replnickarray_80_to_100|replnickarray_100_to_80|required|required_cursopt|resample|reset|resource|resource_manager_location|respect|restart|restore|restricted_user|resume|retaindays|retention|return|revert|rewind|rewindonly|returns|robust|role|rollup|root|round_robin|route|row|rowdump|rowguidcol|rowlock|row_terminator|rows|rows_per_batch|rowsets_only|rowterminator|rowversion|rsa_1024|rsa_2048|rsa_3072|rsa_4096|rsa_512|safe|safety|sample|save|scalar|schema|schemabinding|scoped|scroll|scroll_locks|sddl|second|secexpr|secondary|secondary_only|secondary_role|secret|security|securityaudit|selective|self|send|sent|sequence|serde_method|serializable|server|service|service_broker|service_name|service_objective|session_timeout|session|sessions|seterror|setopts|sets|shard_map_manager|shard_map_name|sharded|shared_memory|show_statistics|showplan_all|showplan_text|showplan_xml|showplan_xml_with_recompile|shrinkdb|shutdown|sid|signature|simple|single_blob|single_clob|single_nclob|single_user|singleton|site|size_based_cleanup_mode|skip|smalldatetime|smallint|smallmoney|snapshot|snapshot_import|snapshotrestorephase|soap|softnuma|sort_in_tempdb|sorted_data|sorted_data_reorg|spatial|sql|sql_bigint|sql_binary|sql_bit|sql_char|sql_date|sql_decimal|sql_double|sql_float|sql_guid|sql_handle|sql_longvarbinary|sql_longvarchar|sql_numeric|sql_real|sql_smallint|sql_time|sql_timestamp|sql_tinyint|sql_tsi_day|sql_tsi_frac_second|sql_tsi_hour|sql_tsi_minute|sql_tsi_month|sql_tsi_quarter|sql_tsi_second|sql_tsi_week|sql_tsi_year|sql_type_date|sql_type_time|sql_type_timestamp|sql_varbinary|sql_varchar|sql_variant|sql_wchar|sql_wlongvarchar|ssl|ssl_port|standard|standby|start|start_date|started|stat_header|state|statement|static|statistics|statistics_incremental|statistics_norecompute|statistics_only|statman|stats|stats_stream|status|stop|stop_on_error|stopat|stopatmark|stopbeforemark|stoplist|stopped|string_delimiter|subject|supplemental_logging|supported|suspend|symmetric|synchronous_commit|synonym|sysname|system|system_time|system_versioning|table|tableresults|tablock|tablockx|take|tape|target|target_index|target_partition|tcp|temporal_history_retention|text|textimage_on|then|thesaurus|throw|time|timeout|timestamp|tinyint|to|top|torn_page_detection|track_columns_updated|trailing|tran|transaction|transfer|triple_des|triple_des_3key|truncate|trustworthy|try|tsql|type|type_desc|type_warning|tzoffset|uid|unbounded|uncommitted|unique|uniqueidentifier|unlimited|unload|unlock|unsafe|updlock|url|use|useplan|useroptions|use_type_default|using|utcdatetime|valid_xml|validation|value|values|varbinary|varchar|verbose|verifyonly|version|view_metadata|virtual_device|visiblity|wait_at_low_priority|waitfor|webmethod|week|weekday|weight|well_formed_xml|when|while|widechar|widechar_ansi|widenative|window|windows|with|within|within group|witness|without|without_array_wrapper|workload|wsdl|xact_abort|xlock|xml|xmlschema|xquery|xsinil|year|zone)\\b", + "match": "\\b(?i)(abort|abort_after_wait|absent|absolute|accent_sensitivity|acceptable_cursopt|acp|action|activation|add|address|admin|aes_128|aes_192|aes_256|affinity|after|aggregate|algorithm|all_constraints|all_errormsgs|all_indexes|all_levels|all_results|allow_connections|allow_dup_row|allow_encrypted_value_modifications|allow_page_locks|allow_row_locks|allow_snapshot_isolation|alter|altercolumn|always|anonymous|ansi_defaults|ansi_null_default|ansi_null_dflt_off|ansi_null_dflt_on|ansi_nulls|ansi_padding|ansi_warnings|appdomain|append|application|apply|arithabort|arithignore|array|assembly|asymmetric|asynchronous_commit|at|atan2|atomic|attach|attach_force_rebuild_log|attach_rebuild_log|audit|auth_realm|authentication|auto|auto_cleanup|auto_close|auto_create_statistics|auto_drop|auto_shrink|auto_update_statistics|auto_update_statistics_async|automated_backup_preference|automatic|autopilot|availability|availability_mode|backup|backup_priority|base64|basic|batches|batchsize|before|between|bigint|binary|binding|bit|block|blockers|blocksize|bmk|both|break|broker|broker_instance|bucket_count|buffer|buffercount|bulk_logged|by|call|caller|card|case|catalog|catch|cert|certificate|change_retention|change_tracking|change_tracking_context|changes|char|character|character_set|check_expiration|check_policy|checkconstraints|checkindex|checkpoint|checksum|cleanup_policy|clear|clear_port|close|clustered|codepage|collection|column_encryption_key|column_master_key|columnstore|columnstore_archive|colv_80_to_100|colv_100_to_80|commit_differential_base|committed|compatibility_level|compress_all_row_groups|compression|compression_delay|concat_null_yields_null|concatenate|configuration|connect|containment|continue|continue_after_error|contract|contract_name|control|conversation|conversation_group_id|conversation_handle|copy|copy_only|count_rows|counter|create(\\\\s+or\\\\s+alter)?|credential|cross|cryptographic|cryptographic_provider|cube|cursor|cursor_close_on_commit|cursor_default|data|data_compression|data_flush_interval_seconds|data_mirroring|data_purity|data_source|database|database_name|database_snapshot|datafiletype|date_correlation_optimization|date|datefirst|dateformat|date_format|datetime|datetime2|datetimeoffset|day(s)?|db_chaining|dbid|dbidexec|dbo_only|deadlock_priority|deallocate|dec|decimal|declare|decrypt|decrypt_a|decryption|default_database|default_fulltext_language|default_language|default_logon_domain|default_schema|definition|delay|delayed_durability|delimitedtext|density_vector|dependent|des|description|desired_state|desx|differential|digest|disable|disable_broker|disable_def_cnst_chk|disabled|disk|distinct|distributed|distribution|drop|drop_existing|dts_buffers|dump|durability|dynamic|edition|elements|else|emergency|empty|enable|enable_broker|enabled|encoding|encrypted|encrypted_value|encryption|encryption_type|end|endpoint|endpoint_url|enhancedintegrity|entry|error_broker_conversations|errorfile|estimateonly|event|except|exec|executable|execute|exists|expand|expiredate|expiry_date|explicit|external|external_access|failover|failover_mode|failure_condition_level|fast|fast_forward|fastfirstrow|federated_service_account|fetch|field_terminator|fieldterminator|file|filelistonly|filegroup|filegrowth|filename|filestream|filestream_log|filestream_on|filetable|file_format|filter|first_row|fips_flagger|fire_triggers|first|firstrow|float|flush_interval_seconds|fmtonly|following|for|force|force_failover_allow_data_loss|force_service_allow_data_loss|forced|forceplan|formatfile|format_options|format_type|formsof|forward_only|free_cursors|free_exec_context|fullscan|fulltext|fulltextall|fulltextkey|function|generated|get|geography|geometry|global|go|goto|governor|guid|hadoop|hardening|hash|hashed|header_limit|headeronly|health_check_timeout|hidden|hierarchyid|histogram|histogram_steps|hits_cursors|hits_exec_context|hour(s)?|http|identity|identity_value|if|ifnull|ignore|ignore_constraints|ignore_dup_key|ignore_dup_row|ignore_triggers|image|immediate|implicit_transactions|include|include_null_values|incremental|index|inflectional|init|initiator|insensitive|insert|instead|int|integer|integrated|intersect|intermediate|interval_length_minutes|into|inuse_cursors|inuse_exec_context|io|is|isabout|iso_week|isolation|job_tracker_location|json|keep|keep_nulls|keep_replication|keepdefaults|keepfixed|keepidentity|keepnulls|kerberos|key|key_path|key_source|key_store_provider_name|keyset|kill|kilobytes_per_batch|labelonly|langid|language|last|lastrow|leading|legacy_cardinality_estimation|length|level|lifetime|lineage_80_to_100|lineage_100_to_80|listener_ip|listener_port|load|loadhistory|lob_compaction|local|local_service_name|locate|location|lock_escalation|lock_timeout|lockres|log|login|login_type|loop|manual|mark_in_use_for_removal|masked|master|matched|max_queue_readers|max_duration|max_outstanding_io_per_volume|maxdop|maxerrors|maxlength|maxtransfersize|max_plans_per_query|max_storage_size_mb|mediadescription|medianame|mediapassword|memogroup|memory_optimized|merge|message|message_forward_size|message_forwarding|microsecond|millisecond|minute(s)?|mirror_address|misses_cursors|misses_exec_context|mixed|modify|money|month|move|multi_user|must_change|name|namespace|nanosecond|native|native_compilation|nchar|ncharacter|nested_triggers|never|new_account|new_broker|newname|next|no|no_browsetable|no_checksum|no_compression|no_infomsgs|no_triggers|no_truncate|nocount|noexec|noexpand|noformat|noinit|nolock|nonatomic|nonclustered|nondurable|none|norecompute|norecovery|noreset|norewind|noskip|not|notification|nounload|now|nowait|ntext|ntlm|nulls|numeric|numeric_roundabort|nvarchar|object|objid|oem|offline|old_account|online|operation_mode|open|openjson|optimistic|option|orc|out|outer|output|over|override|owner|ownership|pad_index|page|page_checksum|page_verify|pagecount|paglock|param|parameter_sniffing|parameter_type_expansion|parameterization|parquet|parseonly|partial|partition|partner|password|path|pause|percentage|permission_set|persisted|period|physical_only|plan_forcing_mode|policy|pool|population|ports|preceding|precision|predicate|presume_abort|primary|primary_role|print|prior|priority |priority_level|private|proc(edure)?|procedure_name|profile|provider|quarter|query_capture_mode|query_governor_cost_limit|query_optimizer_hotfixes|query_store|queue|quoted_identifier|raiserror|range|raw|rcfile|rc2|rc4|rc4_128|rdbms|read_committed_snapshot|read|read_only|read_write|readcommitted|readcommittedlock|readonly|readpast|readuncommitted|readwrite|real|rebuild|receive|recmodel_70backcomp|recompile|reconfigure|recovery|recursive|recursive_triggers|redo_queue|reject_sample_value|reject_type|reject_value|relative|remote|remote_data_archive|remote_proc_transactions|remote_service_name|remove|removed_cursors|removed_exec_context|reorganize|repeat|repeatable|repeatableread|replace|replica|replicated|replnick_100_to_80|replnickarray_80_to_100|replnickarray_100_to_80|required|required_cursopt|resample|reset|resource|resource_manager_location|respect|restart|restore|restricted_user|resume|retaindays|retention|return|revert|rewind|rewindonly|returns|robust|role|rollup|root|round_robin|route|row|rowdump|rowguidcol|rowlock|row_terminator|rows|rows_per_batch|rowsets_only|rowterminator|rowversion|rsa_1024|rsa_2048|rsa_3072|rsa_4096|rsa_512|safe|safety|sample|save|scalar|schema|schemabinding|scoped|scroll|scroll_locks|sddl|second|secexpr|seconds|secondary|secondary_only|secondary_role|secret|security|securityaudit|selective|self|send|sent|sequence|serde_method|serializable|server|service|service_broker|service_name|service_objective|session_timeout|session|sessions|seterror|setopts|sets|shard_map_manager|shard_map_name|sharded|shared_memory|show_statistics|showplan_all|showplan_text|showplan_xml|showplan_xml_with_recompile|shrinkdb|shutdown|sid|signature|simple|single_blob|single_clob|single_nclob|single_user|singleton|site|size|size_based_cleanup_mode|skip|smalldatetime|smallint|smallmoney|snapshot|snapshot_import|snapshotrestorephase|soap|softnuma|sort_in_tempdb|sorted_data|sorted_data_reorg|spatial|sql|sql_bigint|sql_binary|sql_bit|sql_char|sql_date|sql_decimal|sql_double|sql_float|sql_guid|sql_handle|sql_longvarbinary|sql_longvarchar|sql_numeric|sql_real|sql_smallint|sql_time|sql_timestamp|sql_tinyint|sql_tsi_day|sql_tsi_frac_second|sql_tsi_hour|sql_tsi_minute|sql_tsi_month|sql_tsi_quarter|sql_tsi_second|sql_tsi_week|sql_tsi_year|sql_type_date|sql_type_time|sql_type_timestamp|sql_varbinary|sql_varchar|sql_variant|sql_wchar|sql_wlongvarchar|ssl|ssl_port|standard|standby|start|start_date|started|stat_header|state|statement|static|statistics|statistics_incremental|statistics_norecompute|statistics_only|statman|stats|stats_stream|status|stop|stop_on_error|stopat|stopatmark|stopbeforemark|stoplist|stopped|string_delimiter|subject|supplemental_logging|supported|suspend|symmetric|synchronous_commit|synonym|sysname|system|system_time|system_versioning|table|tableresults|tablock|tablockx|take|tape|target|target_index|target_partition|target_recovery_time|tcp|temporal_history_retention|text|textimage_on|then|thesaurus|throw|time|timeout|timestamp|tinyint|to|top|torn_page_detection|track_columns_updated|trailing|tran|transaction|transfer|transform_noise_words|triple_des|triple_des_3key|truncate|trustworthy|try|tsql|two_digit_year_cutoff|type|type_desc|type_warning|tzoffset|uid|unbounded|uncommitted|unique|uniqueidentifier|unlimited|unload|unlock|unsafe|updlock|url|use|useplan|useroptions|use_type_default|using|utcdatetime|valid_xml|validation|value|values|varbinary|varchar|verbose|verifyonly|version|view_metadata|virtual_device|visiblity|wait_at_low_priority|waitfor|webmethod|week|weekday|weight|well_formed_xml|when|while|widechar|widechar_ansi|widenative|window|windows|with|within|within group|witness|without|without_array_wrapper|workload|wsdl|xact_abort|xlock|xml|xmlschema|xquery|xsinil|year|zone)\\b", "name": "keyword.other.sql" }, { @@ -424,14 +424,22 @@ "patterns": [] }, { - "begin": "/\\*", - "captures": { - "0": { - "name": "punctuation.definition.comment.sql" - } - }, - "end": "\\*/", - "name": "comment.block.c" + "include": "#comment-block" + } + ] + }, + "comment-block": { + "begin": "/\\*", + "captures": { + "0": { + "name": "punctuation.definition.comment.sql" + } + }, + "end": "\\*/", + "name": "comment.block", + "patterns": [ + { + "include": "#comment-block" } ] }, diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json index 4202bdd7d2a..e81c3b9adca 100644 --- a/extensions/theme-abyss/themes/abyss-color-theme.json +++ b/extensions/theme-abyss/themes/abyss-color-theme.json @@ -17,11 +17,8 @@ } }, { - "name": "Comments", - "scope": [ - "comment", - "string.quoted.docstring" - ], + "name": "Comment", + "scope": "comment", "settings": { "foreground": "#384887" } diff --git a/extensions/theme-defaults/package.json b/extensions/theme-defaults/package.json index 7716571721b..2458ef317da 100644 --- a/extensions/theme-defaults/package.json +++ b/extensions/theme-defaults/package.json @@ -21,9 +21,9 @@ }, { "id": "Default Dark Modern", - "label": "%darkPlusExperimentalColorThemeLabel%", + "label": "%darkModernThemeLabel%", "uiTheme": "vs-dark", - "path": "./themes/dark_plus_experimental.json" + "path": "./themes/dark_modern.json" }, { "id": "Default Light+", @@ -33,9 +33,9 @@ }, { "id": "Default Light Modern", - "label": "%lightPlusExperimentalColorThemeLabel%", + "label": "%lightModernThemeLabel%", "uiTheme": "vs", - "path": "./themes/light_plus_experimental.json" + "path": "./themes/light_modern.json" }, { "id": "Visual Studio Dark", diff --git a/extensions/theme-defaults/package.nls.json b/extensions/theme-defaults/package.nls.json index b39b054ff35..cacbd6b8d9a 100644 --- a/extensions/theme-defaults/package.nls.json +++ b/extensions/theme-defaults/package.nls.json @@ -2,9 +2,9 @@ "displayName": "Default Themes", "description": "The default Visual Studio light and dark themes", "darkPlusColorThemeLabel": "Dark+", - "darkPlusExperimentalColorThemeLabel": "Dark Modern", + "darkModernThemeLabel": "Dark Modern", "lightPlusColorThemeLabel": "Light+", - "lightPlusExperimentalColorThemeLabel": "Light Modern", + "lightModernThemeLabel": "Light Modern", "darkColorThemeLabel": "Dark (Visual Studio)", "lightColorThemeLabel": "Light (Visual Studio)", "hcColorThemeLabel": "Dark High Contrast", diff --git a/extensions/theme-defaults/themes/dark_modern.json b/extensions/theme-defaults/themes/dark_modern.json new file mode 100644 index 00000000000..a4ff77a31e3 --- /dev/null +++ b/extensions/theme-defaults/themes/dark_modern.json @@ -0,0 +1,125 @@ +{ + "$schema": "vscode://schemas/color-theme", + "name": "Default Dark Modern", + "include": "./dark_plus.json", + "colors": { + "activityBar.activeBorder": "#0078D4", + "activityBar.background": "#181818", + "activityBar.border": "#2B2B2B", + "activityBar.foreground": "#D7D7D7", + "activityBar.inactiveForeground": "#868686", + "activityBarBadge.background": "#0078D4", + "activityBarBadge.foreground": "#FFFFFF", + "badge.background": "#616161", + "badge.foreground": "#F8F8F8", + "button.background": "#0078D4", + "button.border": "#FFFFFF12", + "button.foreground": "#FFFFFF", + "button.hoverBackground": "#026EC1", + "button.secondaryBackground": "#1F1F1F", + "button.secondaryForeground": "#CCCCCC", + "button.secondaryHoverBackground": "#2B2B2B", + "checkbox.background": "#313131", + "checkbox.border": "#3C3C3C", + "debugToolBar.background": "#181818", + "descriptionForeground": "#9D9D9D", + "dropdown.background": "#313131", + "dropdown.border": "#3C3C3C", + "dropdown.foreground": "#CCCCCC", + "dropdown.listBackground": "#1F1F1F", + "editor.background": "#1F1F1F", + "editor.findMatchBackground": "#9E6A03", + "editor.foreground": "#CCCCCC", + "editorGroup.border": "#FFFFFF17", + "editorGroupHeader.tabsBackground": "#181818", + "editorGroupHeader.tabsBorder": "#2B2B2B", + "editorGutter.addedBackground": "#2EA043", + "editorGutter.deletedBackground": "#F85149", + "editorGutter.modifiedBackground": "#0078D4", + "editorLineNumber.activeForeground": "#CCCCCC", + "editorLineNumber.foreground": "#6E7681", + "editorOverviewRuler.border": "#010409", + "editorWidget.background": "#2B2B2B", + "errorForeground": "#F85149", + "focusBorder": "#0078D4", + "foreground": "#CCCCCC", + "icon.foreground": "#CCCCCC", + "input.background": "#2A2A2A", + "input.border": "#3C3C3C", + "input.foreground": "#CCCCCC", + "input.placeholderForeground": "#9D9D9D", + "inputOption.activeBackground": "#2489DB82", + "inputOption.activeBorder": "#2488DB", + "keybindingLabel.foreground": "#CCCCCC", + "menu.background": "#1F1F1F", + "notificationCenterHeader.background": "#1F1F1F", + "notificationCenterHeader.foreground": "#CCCCCC", + "notifications.background": "#1F1F1F", + "notifications.border": "#2B2B2B", + "notifications.foreground": "#CCCCCC", + "panel.background": "#181818", + "panel.border": "#2B2B2B", + "panelInput.border": "#2B2B2B", + "panelTitle.activeBorder": "#0078D4", + "panelTitle.activeForeground": "#CCCCCC", + "panelTitle.inactiveForeground": "#9D9D9D", + "peekViewEditor.background": "#1F1F1F", + "peekViewEditor.matchHighlightBackground": "#BB800966", + "peekViewResult.background": "#1F1F1F", + "peekViewResult.matchHighlightBackground": "#BB800966", + "pickerGroup.border": "#2B2B2B", + "pickerGroup.foreground": "#8B949E", + "progressBar.background": "#0078D4", + "quickInput.background": "#2A2A2A", + "quickInput.foreground": "#CCCCCC", + "settings.dropdownBackground": "#313131", + "settings.dropdownBorder": "#3C3C3C", + "settings.headerForeground": "#FFFFFF", + "settings.modifiedItemIndicator": "#BB800966", + "sideBar.background": "#181818", + "sideBar.border": "#2B2B2B", + "sideBar.foreground": "#CCCCCC", + "sideBarSectionHeader.background": "#181818", + "sideBarSectionHeader.border": "#2B2B2B", + "sideBarSectionHeader.foreground": "#CCCCCC", + "sideBarTitle.foreground": "#CCCCCC", + "statusBar.background": "#181818", + "statusBar.border": "#2B2B2B", + "statusBar.debuggingBackground": "#0078D4", + "statusBar.debuggingForeground": "#FFFFFF", + "statusBar.focusBorder": "#0078D4", + "statusBar.foreground": "#CCCCCC", + "statusBar.noFolderBackground": "#1F1F1F", + "statusBarItem.focusBorder": "#0078D4", + "statusBarItem.prominentBackground": "#6E768166", + "statusBarItem.remoteBackground": "#0078D4", + "statusBarItem.remoteForeground": "#FFFFFF", + "tab.activeBackground": "#1F1F1F", + "tab.activeBorder": "#1F1F1F", + "tab.activeBorderTop": "#0078D4", + "tab.activeForeground": "#FFFFFF", + "tab.border": "#2B2B2B", + "tab.hoverBackground": "#1F1F1F", + "tab.inactiveBackground": "#181818", + "tab.inactiveForeground": "#9D9D9D", + "tab.unfocusedActiveBorder": "#1F1F1F", + "tab.unfocusedActiveBorderTop": "#2B2B2B", + "tab.unfocusedHoverBackground": "#1F1F1F", + "terminal.foreground": "#CCCCCC", + "terminal.tab.activeBorder": "#0078D4", + "textBlockQuote.background": "#2B2B2B", + "textBlockQuote.border": "#616161", + "textCodeBlock.background": "#2B2B2B", + "textLink.activeForeground": "#40A6FF", + "textLink.foreground": "#40A6FF", + "textSeparator.foreground": "#21262D", + "titleBar.activeBackground": "#181818", + "titleBar.activeForeground": "#CCCCCC", + "titleBar.border": "#2B2B2B", + "titleBar.inactiveBackground": "#1F1F1F", + "titleBar.inactiveForeground": "#9D9D9D", + "welcomePage.tileBackground": "#2B2B2B", + "welcomePage.progress.foreground": "#0078D4", + "widget.border": "#333333", + }, +} diff --git a/extensions/theme-defaults/themes/dark_plus_experimental.json b/extensions/theme-defaults/themes/dark_plus_experimental.json deleted file mode 100644 index d5623cc1a5b..00000000000 --- a/extensions/theme-defaults/themes/dark_plus_experimental.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "$schema": "vscode://schemas/color-theme", - "name": "Default Dark Modern", - "include": "./dark_plus.json", - "colors": { - "activityBar.activeBorder": "#0078d4", - "activityBar.background": "#181818", - "activityBar.border": "#ffffff15", - "activityBar.foreground": "#d7d7d7", - "activityBar.inactiveForeground": "#ffffff80", - "activityBarBadge.background": "#0078d4", - "activityBarBadge.foreground": "#ffffff", - "badge.background": "#0078d4", - "badge.foreground": "#ffffff", - "button.background": "#0078d4", - "button.border": "#ffffff12", - "button.foreground": "#ffffff", - "button.hoverBackground": "#0078d4e6", - "button.secondaryBackground": "#FFFFFF0F", - "button.secondaryForeground": "#cccccc", - "button.secondaryHoverBackground": "#ffffff15", - "checkbox.background": "#313131", - "checkbox.border": "#ffffff1f", - "debugToolBar.background": "#181818", - "descriptionForeground": "#8b949e", - "diffEditor.insertedLineBackground": "#23863633", - "diffEditor.insertedTextBackground": "#2386364d", - "diffEditor.removedLineBackground": "#da363333", - "diffEditor.removedTextBackground": "#da36334d", - "dropdown.background": "#313131", - "dropdown.border": "#ffffff1f", - "dropdown.foreground": "#cccccc", - "dropdown.listBackground": "#313131", - "editor.background": "#1f1f1f", - "editor.findMatchBackground": "#9e6a03", - "editor.foreground": "#cccccc", - "editorGroup.border": "#ffffff17", - "editorGroupHeader.tabsBackground": "#181818", - "editorGroupHeader.tabsBorder": "#ffffff15", - "editorGutter.addedBackground": "#2ea043", - "editorGutter.deletedBackground": "#f85149", - "editorGutter.modifiedBackground": "#0078d4", - "editorInlayHint.background": "#8b949e33", - "editorInlayHint.foreground": "#8b949e", - "editorInlayHint.typeBackground": "#8b949e33", - "editorInlayHint.typeForeground": "#8b949e", - "editorLineNumber.activeForeground": "#cccccc", - "editorLineNumber.foreground": "#6e7681", - "editorOverviewRuler.border": "#010409", - "editorWidget.background": "#1f1f1f", - "errorForeground": "#f85149", - "focusBorder": "#0078d4", - "foreground": "#cccccc", - "icon.foreground": "#cccccc", - "input.background": "#2a2a2a", - "input.border": "#ffffff1f", - "input.foreground": "#cccccc", - "input.placeholderForeground": "#ffffff79", - "inputOption.activeBackground": "#2489db82", - "inputOption.activeBorder": "#2488db", - "keybindingLabel.foreground": "#cccccc", - "list.activeSelectionBackground": "#323232", - "list.activeSelectionIconForeground": "#ffffff", - "list.activeSelectionForeground": "#ffffff", - "menu.background": "#1f1f1f", - "notificationCenterHeader.background": "#1f1f1f", - "notificationCenterHeader.foreground": "#cccccc", - "notifications.background": "#1f1f1f", - "notifications.border": "#ffffff15", - "notifications.foreground": "#cccccc", - "panel.background": "#181818", - "panel.border": "#ffffff15", - "panelInput.border": "#ffffff15", - "panelTitle.activeBorder": "#0078d4", - "panelTitle.activeForeground": "#cccccc", - "panelTitle.inactiveForeground": "#8b949e", - "peekViewEditor.background": "#1f1f1f", - "peekViewEditor.matchHighlightBackground": "#bb800966", - "peekViewResult.background": "#1f1f1f", - "peekViewResult.matchHighlightBackground": "#bb800966", - "pickerGroup.border": "#ffffff15", - "pickerGroup.foreground": "#8b949e", - "progressBar.background": "#0078d4", - "quickInput.background": "#1f1f1f", - "quickInput.foreground": "#cccccc", - "scrollbar.shadow": "#484f5833", - "scrollbarSlider.activeBackground": "#6e768187", - "scrollbarSlider.background": "#6e768133", - "scrollbarSlider.hoverBackground": "#6e768145", - "settings.dropdownBackground": "#313131", - "settings.dropdownBorder": "#ffffff1f", - "settings.headerForeground": "#ffffff", - "settings.modifiedItemIndicator": "#bb800966", - "sideBar.background": "#181818", - "sideBar.border": "#ffffff15", - "sideBar.foreground": "#cccccc", - "sideBarSectionHeader.background": "#181818", - "sideBarSectionHeader.border": "#ffffff15", - "sideBarSectionHeader.foreground": "#cccccc", - "sideBarTitle.foreground": "#cccccc", - "statusBar.background": "#181818", - "statusBar.border": "#ffffff15", - "statusBar.debuggingBackground": "#0078d4", - "statusBar.debuggingForeground": "#ffffff", - "statusBar.foreground": "#cccccc", - "statusBar.noFolderBackground": "#1f1f1f", - "statusBarItem.focusBorder": "#0078d4", - "statusBarItem.prominentBackground": "#6e768166", - "statusBarItem.remoteBackground": "#0078d4", - "statusBarItem.remoteForeground": "#ffffff", - "tab.activeBackground": "#1f1f1f", - "tab.activeBorder": "#1f1f1f", - "tab.activeBorderTop": "#0078d4", - "tab.activeForeground": "#ffffff", - "tab.border": "#ffffff15", - "tab.hoverBackground": "#1f1f1f", - "tab.inactiveBackground": "#181818", - "tab.inactiveForeground": "#ffffff80", - "tab.unfocusedActiveBorder": "#1f1f1f", - "tab.unfocusedActiveBorderTop": "#ffffff15", - "tab.unfocusedHoverBackground": "#6e76811a", - "terminal.foreground": "#cccccc", - "terminal.tab.activeBorder": "#0078d4", - "textBlockQuote.background": "#010409", - "textBlockQuote.border": "#ffffff14", - "textCodeBlock.background": "#6e768166", - "textLink.activeForeground": "#40A6FF", - "textLink.foreground": "#40A6FF", - "textSeparator.foreground": "#21262d", - "titleBar.activeBackground": "#181818", - "titleBar.activeForeground": "#cccccc", - "titleBar.border": "#ffffff15", - "titleBar.inactiveBackground": "#1f1f1f", - "titleBar.inactiveForeground": "#8b949e", - "welcomePage.tileBackground": "#ffffff0f", - "welcomePage.progress.foreground": "#0078d4", - "widget.border": "#ffffff15", - }, -} diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json index 04e33e07063..38af44cd2c1 100644 --- a/extensions/theme-defaults/themes/dark_vs.json +++ b/extensions/theme-defaults/themes/dark_vs.json @@ -57,11 +57,7 @@ } }, { - "name": "Comments", - "scope": [ - "comment", - "string.quoted.docstring" - ], + "scope": "comment", "settings": { "foreground": "#6A9955" } diff --git a/extensions/theme-defaults/themes/hc_black.json b/extensions/theme-defaults/themes/hc_black.json index dbc3d2808c2..b8eda7974b7 100644 --- a/extensions/theme-defaults/themes/hc_black.json +++ b/extensions/theme-defaults/themes/hc_black.json @@ -43,11 +43,7 @@ } }, { - "name": "Comments", - "scope": [ - "comment", - "string.quoted.docstring" - ], + "scope": "comment", "settings": { "foreground": "#7ca668" } diff --git a/extensions/theme-defaults/themes/hc_light.json b/extensions/theme-defaults/themes/hc_light.json index 5a06c116a1a..83a4083f90b 100644 --- a/extensions/theme-defaults/themes/hc_light.json +++ b/extensions/theme-defaults/themes/hc_light.json @@ -27,11 +27,7 @@ } }, { - "name": "Comments", - "scope": [ - "comment", - "string.quoted.docstring" - ], + "scope": "comment", "settings": { "foreground": "#515151" } diff --git a/extensions/theme-defaults/themes/light_modern.json b/extensions/theme-defaults/themes/light_modern.json new file mode 100644 index 00000000000..2fb9a7aee79 --- /dev/null +++ b/extensions/theme-defaults/themes/light_modern.json @@ -0,0 +1,141 @@ +{ + "$schema": "vscode://schemas/color-theme", + "name": "Default Light Modern", + "include": "./light_plus.json", + "colors": { + "activityBar.activeBorder": "#005FB8", + "activityBar.background": "#F8F8F8", + "activityBar.border": "#E5E5E5", + "activityBar.foreground": "#1F1F1F", + "activityBar.inactiveForeground": "#616161", + "activityBarBadge.background": "#005FB8", + "activityBarBadge.foreground": "#FFFFFF", + "badge.background": "#CCCCCC", + "badge.foreground": "#3B3B3B", + "button.background": "#005FB8", + "button.border": "#0000001a", + "button.foreground": "#FFFFFF", + "button.hoverBackground": "#0258A8", + "button.secondaryBackground": "#E5E5E5", + "button.secondaryForeground": "#3B3B3B", + "button.secondaryHoverBackground": "#CBCBCB", + "checkbox.background": "#F8F8F8", + "checkbox.border": "#CECECE", + "descriptionForeground": "#3B3B3B", + "dropdown.background": "#FFFFFF", + "dropdown.border": "#CECECE", + "dropdown.foreground": "#3B3B3B", + "dropdown.listBackground": "#FFFFFF", + "editor.background": "#FFFFFF", + "editor.foreground": "#3B3B3B", + "editor.inactiveSelectionBackground": "#E5EBF1", + "editor.selectionHighlightBackground": "#ADD6FF80", + "editorGroup.border": "#E5E5E5", + "editorGroupHeader.tabsBackground": "#F8F8F8", + "editorGroupHeader.tabsBorder": "#E5E5E5", + "editorGutter.addedBackground": "#2EA043", + "editorGutter.deletedBackground": "#F85149", + "editorGutter.modifiedBackground": "#005FB8", + "editorIndentGuide.background": "#D3D3D3", + "editorLineNumber.activeForeground": "#171184", + "editorLineNumber.foreground": "#6E7681", + "editorOverviewRuler.border": "#E5E5E5", + "editorSuggestWidget.background": "#F8F8F8", + "editorWidget.background": "#F8F8F8", + "errorForeground": "#F85149", + "focusBorder": "#005FB8", + "foreground": "#3B3B3B", + "icon.foreground": "#3B3B3B", + "input.background": "#FFFFFF", + "input.border": "#CECECE", + "input.foreground": "#3B3B3B", + "input.placeholderForeground": "#868686", + "inputOption.activeBackground": "#BED6ED", + "inputOption.activeBorder": "#005FB8", + "inputOption.activeForeground": "#000000", + "keybindingLabel.foreground": "#3B3B3B", + "list.activeSelectionBackground": "#E8E8E8", + "list.activeSelectionForeground": "#000000", + "list.activeSelectionIconForeground": "#000000", + "list.hoverBackground": "#F2F2F2", + "list.focusAndSelectionOutline": "#005FB8", + "menu.border": "#CECECE", + "notebook.cellBorderColor": "#E5E5E5", + "notebook.selectedCellBackground": "#C8DDF150", + "notificationCenterHeader.background": "#FFFFFF", + "notificationCenterHeader.foreground": "#3B3B3B", + "notifications.background": "#FFFFFF", + "notifications.border": "#E5E5E5", + "notifications.foreground": "#3B3B3B", + "panel.background": "#F8F8F8", + "panel.border": "#E5E5E5", + "panelInput.border": "#E5E5E5", + "panelTitle.activeBorder": "#005FB8", + "panelTitle.activeForeground": "#3B3B3B", + "panelTitle.inactiveForeground": "#3B3B3B", + "peekViewEditor.matchHighlightBackground": "#BB800966", + "peekViewResult.background": "#FFFFFF", + "peekViewResult.matchHighlightBackground": "#BB800966", + "pickerGroup.border": "#E5E5E5", + "pickerGroup.foreground": "#8B949E", + "ports.iconRunningProcessForeground": "#369432", + "progressBar.background": "#005FB8", + "quickInput.background": "#F8F8F8", + "quickInput.foreground": "#3B3B3B", + "searchEditor.textInputBorder": "#CECECE", + "settings.dropdownBackground": "#FFFFFF", + "settings.dropdownBorder": "#CECECE", + "settings.headerForeground": "#1F1F1F", + "settings.modifiedItemIndicator": "#BB800966", + "settings.numberInputBorder": "#CECECE", + "settings.textInputBorder": "#CECECE", + "sideBar.background": "#F8F8F8", + "sideBar.border": "#E5E5E5", + "sideBar.foreground": "#3B3B3B", + "sideBarSectionHeader.background": "#F8F8F8", + "sideBarSectionHeader.border": "#E5E5E5", + "sideBarSectionHeader.foreground": "#3B3B3B", + "sideBarTitle.foreground": "#3B3B3B", + "statusBar.background": "#F8F8F8", + "statusBar.foreground": "#3B3B3B", + "statusBar.border": "#E5E5E5", + "statusBar.debuggingBackground": "#FD716C", + "statusBar.debuggingForeground": "#000000", + "statusBar.focusBorder": "#005FB8", + "statusBar.noFolderBackground": "#F8F8F8", + "statusBarItem.errorBackground": "#C72E0F", + "statusBarItem.focusBorder": "#005FB8", + "statusBarItem.prominentBackground": "#6E768166", + "statusBarItem.remoteBackground": "#005FB8", + "statusBarItem.remoteForeground": "#FFFFFF", + "tab.activeBackground": "#FFFFFF", + "tab.activeBorder": "#F8F8F8", + "tab.activeBorderTop": "#005FB8", + "tab.activeForeground": "#3B3B3B", + "tab.border": "#E5E5E5", + "tab.hoverBackground": "#FFFFFF", + "tab.inactiveBackground": "#F8F8F8", + "tab.inactiveForeground": "#868686", + "tab.lastPinnedBorder": "#D4D4D4", + "tab.unfocusedActiveBorder": "#F8F8F8", + "tab.unfocusedActiveBorderTop": "#E5E5E5", + "tab.unfocusedHoverBackground": "#F8F8F8", + "terminalCursor.foreground": "#005FB8", + "terminal.foreground": "#3B3B3B", + "terminal.inactiveSelectionBackground": "#E5EBF1", + "terminal.tab.activeBorder": "#005FB8", + "textBlockQuote.background": "#F8F8F8", + "textBlockQuote.border": "#E5E5E5", + "textCodeBlock.background": "#F8F8F8", + "textLink.activeForeground": "#005FB8", + "textLink.foreground": "#005FB8", + "textSeparator.foreground": "#21262D", + "titleBar.activeBackground": "#F8F8F8", + "titleBar.activeForeground": "#1E1E1E", + "titleBar.border": "#E5E5E5", + "titleBar.inactiveBackground": "#F8F8F8", + "titleBar.inactiveForeground": "#8B949E", + "welcomePage.tileBackground": "#F3F3F3", + "widget.border": "#E5E5E5" + }, +} diff --git a/extensions/theme-defaults/themes/light_plus_experimental.json b/extensions/theme-defaults/themes/light_plus_experimental.json deleted file mode 100644 index 1bd197f4606..00000000000 --- a/extensions/theme-defaults/themes/light_plus_experimental.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "$schema": "vscode://schemas/color-theme", - "name": "Default Light Modern", - "include": "./light_plus.json", - "colors": { - "activityBar.activeBorder": "#005FB8", - "activityBar.background": "#f8f8f8", - "activityBar.border": "#0000001a", - "activityBar.foreground": "#1f1f1f", - "activityBar.inactiveForeground": "#0000009e", - "activityBarBadge.background": "#005FB8", - "activityBarBadge.foreground": "#ffffff", - "badge.background": "#005FB8", - "badge.foreground": "#ffffff", - "button.background": "#005FB8", - "button.border": "#0000001a", - "button.foreground": "#ffffff", - "button.hoverBackground": "#005FB8e6", - "button.secondaryBackground": "#0000001a", - "button.secondaryForeground": "#3b3b3b", - "button.secondaryHoverBackground": "#00000034", - "checkbox.background": "#f8f8f8", - "checkbox.border": "#CECECE", - "descriptionForeground": "#3b3b3b", - "diffEditor.insertedLineBackground": "#23863633", - "diffEditor.insertedTextBackground": "#2386364d", - "diffEditor.removedLineBackground": "#da363333", - "diffEditor.removedTextBackground": "#da36334d", - "dropdown.background": "#ffffff", - "dropdown.border": "#CECECE", - "dropdown.foreground": "#3b3b3b", - "dropdown.listBackground": "#ffffff", - "editor.background": "#ffffff", - "editor.foreground": "#3b3b3b", - "editor.inactiveSelectionBackground": "#E5EBF1", - "editor.selectionHighlightBackground": "#ADD6FF80", - "editorGroup.border": "#0000001a", - "editorGroupHeader.tabsBackground": "#f8f8f8", - "editorGroupHeader.tabsBorder": "#0000001a", - "editorGutter.addedBackground": "#2ea043", - "editorGutter.deletedBackground": "#f85149", - "editorGutter.modifiedBackground": "#005FB8", - "editorIndentGuide.background": "#D3D3D3", - "editorInlayHint.background": "#8b949e33", - "editorInlayHint.foreground": "#8b949e", - "editorInlayHint.typeBackground": "#8b949e33", - "editorInlayHint.typeForeground": "#8b949e", - "editorLineNumber.activeForeground": "#171184", - "editorLineNumber.foreground": "#6e7681", - "editorOverviewRuler.border": "#0000001a", - "editorSuggestWidget.background": "#f8f8f8", - "editorWidget.background": "#ffffff", - "errorForeground": "#f85149", - "focusBorder": "#005FB8", - "foreground": "#3b3b3b", - "icon.foreground": "#3b3b3b", - "input.background": "#ffffff", - "input.border": "#CECECE", - "input.foreground": "#3b3b3b", - "input.placeholderForeground": "#00000079", - "inputOption.activeBackground": "#005fb841", - "inputOption.activeBorder": "#005FB8", - "inputOption.activeForeground": "#000000", - "keybindingLabel.foreground": "#3b3b3b", - "list.activeSelectionBackground": "#e8e8e8", - "list.activeSelectionForeground": "#000000", - "list.activeSelectionIconForeground": "#000000", - "list.hoverBackground": "#f2f2f2", - "menu.border": "#D4D4D4", - "notebook.cellBorderColor": "#E8E8E8", - "notebook.selectedCellBackground": "#c8ddf150", - "notificationCenterHeader.background": "#ffffff", - "notificationCenterHeader.foreground": "#3b3b3b", - "notifications.background": "#ffffff", - "notifications.border": "#0000001a", - "notifications.foreground": "#3b3b3b", - "panel.background": "#f8f8f8", - "panel.border": "#0000001a", - "panelInput.border": "#0000001a", - "panelTitle.activeBorder": "#005FB8", - "panelTitle.activeForeground": "#3b3b3b", - "panelTitle.inactiveForeground": "#3b3b3b", - "peekViewEditor.matchHighlightBackground": "#bb800966", - "peekViewResult.background": "#ffffff", - "peekViewResult.matchHighlightBackground": "#bb800966", - "pickerGroup.border": "#0000001a", - "pickerGroup.foreground": "#8b949e", - "ports.iconRunningProcessForeground": "#369432", - "progressBar.background": "#005FB8", - "quickInput.background": "#ffffff", - "quickInput.foreground": "#3b3b3b", - "scrollbar.shadow": "#484f5833", - "scrollbarSlider.activeBackground": "#6e768187", - "scrollbarSlider.background": "#6e768133", - "scrollbarSlider.hoverBackground": "#6e768145", - "searchEditor.textInputBorder": "#CECECE", - "settings.dropdownBackground": "#ffffff", - "settings.dropdownBorder": "#CECECE", - "settings.headerForeground": "#1f1f1f", - "settings.modifiedItemIndicator": "#bb800966", - "settings.numberInputBorder": "#CECECE", - "settings.textInputBorder": "#CECECE", - "sideBar.background": "#f8f8f8", - "sideBar.border": "#0000001a", - "sideBar.foreground": "#3b3b3b", - "sideBarSectionHeader.background": "#f8f8f8", - "sideBarSectionHeader.border": "#0000001a", - "sideBarSectionHeader.foreground": "#3b3b3b", - "sideBarTitle.foreground": "#3b3b3b", - "statusBar.background": "#f8f8f8", - "statusBar.foreground": "#3b3b3b", - "statusBar.border": "#0000001a", - "statusBar.debuggingBackground": "#fd716c", - "statusBar.debuggingForeground": "#000000", - "statusBar.focusBorder": "#005FB8", - "statusBar.noFolderBackground": "#f8f8f8", - "statusBarItem.errorBackground": "#c72e0f", - "statusBarItem.focusBorder": "#005FB8", - "statusBarItem.prominentBackground": "#6e768166", - "statusBarItem.remoteBackground": "#005FB8", - "statusBarItem.remoteForeground": "#ffffff", - "tab.activeBackground": "#ffffff", - "tab.activeBorder": "#f8f8f8", - "tab.activeBorderTop": "#005FB8", - "tab.activeForeground": "#3b3b3b", - "tab.border": "#0000001a", - "tab.hoverBackground": "#ffffff", - "tab.inactiveBackground": "#f8f8f8", - "tab.inactiveForeground": "#00000080", - "tab.lastPinnedBorder": "#3b3b3b30", - "tab.unfocusedActiveBorder": "#f8f8f8", - "tab.unfocusedActiveBorderTop": "#00000015", - "tab.unfocusedHoverBackground": "#6e76811a", - "terminalCursor.foreground": "#005FB8", - "terminal.foreground": "#3b3b3b", - "terminal.inactiveSelectionBackground": "#E5EBF1", - "terminal.tab.activeBorder": "#005fb8", - "textBlockQuote.background": "#f8f8f8", - "textBlockQuote.border": "#0000001a", - "textCodeBlock.background": "#6e768166", - "textLink.activeForeground": "#005FB8", - "textLink.foreground": "#005FB8", - "textSeparator.foreground": "#21262d", - "titleBar.activeBackground": "#f8f8f8", - "titleBar.activeForeground": "#1e1e1e", - "titleBar.border": "#0000001a", - "titleBar.inactiveBackground": "#f8f8f8", - "titleBar.inactiveForeground": "#8b949e", - "welcomePage.tileBackground": "#f3f3f3", - "widget.border": "#0000001a", - }, -} diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json index 2cfe0ec0448..89589bb0e74 100644 --- a/extensions/theme-defaults/themes/light_vs.json +++ b/extensions/theme-defaults/themes/light_vs.json @@ -62,11 +62,7 @@ } }, { - "name": "Comments", - "scope": [ - "comment", - "string.quoted.docstring" - ], + "scope": "comment", "settings": { "foreground": "#008000" } 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 b8f95bf86aa..eeb4eeb6b88 100644 --- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json +++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json @@ -81,8 +81,7 @@ "name": "Comments", "scope": [ "comment", - "punctuation.definition.comment", - "string.quoted.docstring" + "punctuation.definition.comment" ], "settings": { "foreground": "#a57a4c" diff --git a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json index 2ed1bcc96e0..ea84bededd5 100644 --- a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json +++ b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json @@ -78,11 +78,8 @@ } }, { - "name": "Comments", - "scope": [ - "comment", - "string.quoted.docstring" - ], + "name": "Comment", + "scope": "comment", "settings": { "fontStyle": "", "foreground": "#9A9B99" diff --git a/extensions/theme-monokai/themes/monokai-color-theme.json b/extensions/theme-monokai/themes/monokai-color-theme.json index 2fddaa5972c..6489b0dd39c 100644 --- a/extensions/theme-monokai/themes/monokai-color-theme.json +++ b/extensions/theme-monokai/themes/monokai-color-theme.json @@ -118,11 +118,8 @@ } }, { - "name": "Comments", - "scope": [ - "comment", - "string.quoted.docstring" - ], + "name": "Comment", + "scope": "comment", "settings": { "foreground": "#88846f" } diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json index a01c73d3ec5..9d55f2e362b 100644 --- a/extensions/theme-quietlight/themes/quietlight-color-theme.json +++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json @@ -20,8 +20,7 @@ "name": "Comments", "scope": [ "comment", - "punctuation.definition.comment", - "string.quoted.docstring" + "punctuation.definition.comment" ], "settings": { "fontStyle": "italic", diff --git a/extensions/theme-red/themes/Red-color-theme.json b/extensions/theme-red/themes/Red-color-theme.json index cf0f69316b2..c139400dc56 100644 --- a/extensions/theme-red/themes/Red-color-theme.json +++ b/extensions/theme-red/themes/Red-color-theme.json @@ -77,11 +77,8 @@ } }, { - "name": "Comments", - "scope": [ - "comment", - "string.quoted.docstring" - ], + "name": "Comment", + "scope": "comment", "settings": { "fontStyle": "italic", "foreground": "#e7c0c0ff" diff --git a/extensions/theme-seti/build/update-icon-theme.js b/extensions/theme-seti/build/update-icon-theme.js index ab2a1c81e81..366e7f37dd6 100644 --- a/extensions/theme-seti/build/update-icon-theme.js +++ b/extensions/theme-seti/build/update-icon-theme.js @@ -44,6 +44,7 @@ const nonBuiltInLanguages = { // { fileNames, extensions } // list of languagesId that inherit the icon from another language const inheritIconFromLanguage = { "jsonc": 'json', + "jsonl": 'json', "postcss": 'css', "django-html": 'html', "blade": 'php' diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json index f5b78299680..184cded8cad 100644 --- a/extensions/theme-seti/icons/vs-seti-icon-theme.json +++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json @@ -1943,6 +1943,7 @@ "todo": "_todo", "vala": "_vala", "vue": "_vue", + "jsonl": "_json", "postcss": "_css", "django-html": "_html_3", "blade": "_php" @@ -2257,6 +2258,7 @@ "terraform": "_terraform_light", "vala": "_vala_light", "vue": "_vue_light", + "jsonl": "_json_light", "postcss": "_css_light", "django-html": "_html_3_light", "blade": "_php_light" diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json index 3abb94bd426..e10c6e67403 100644 --- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json +++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json @@ -17,11 +17,8 @@ } }, { - "name": "Comments", - "scope": [ - "comment", - "string.quoted.docstring" - ], + "name": "Comment", + "scope": "comment", "settings": { "fontStyle": "italic", "foreground": "#586E75" diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json index 19ccf4fc92e..8b4074c9a07 100644 --- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json +++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json @@ -17,11 +17,8 @@ } }, { - "name": "Comments", - "scope": [ - "comment", - "string.quoted.docstring" - ], + "name": "Comment", + "scope": "comment", "settings": { "fontStyle": "italic", "foreground": "#93A1A1" 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 5591d39f1a9..8e24e6fe4de 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 @@ -78,11 +78,8 @@ } }, { - "name": "Comments", - "scope": [ - "comment", - "string.quoted.docstring" - ], + "name": "Comment", + "scope": "comment", "settings": { "foreground": "#7285B7" } diff --git a/extensions/typescript-basics/cgmanifest.json b/extensions/typescript-basics/cgmanifest.json index d0261905ada..4b7b1b2d37a 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": "e0aefd8205cc9d1bc7859cc5babbee0d833dca0f" + "commitHash": "8c7482b94b548eab56da64dbfb30b82589b3f747" } }, "license": "MIT", diff --git a/extensions/typescript-basics/language-configuration.json b/extensions/typescript-basics/language-configuration.json index e420bc3a995..03f06fa04d5 100644 --- a/extensions/typescript-basics/language-configuration.json +++ b/extensions/typescript-basics/language-configuration.json @@ -206,6 +206,15 @@ "action": { "indent": "indent" } + }, + { + // Decrease indentation after single line if/else if/else, for, or while + "previousLineText": "^\\s*(((else ?)?if|for|while)\\s*\\(.*\\)\\s*|else\\s*)$", + // But make sure line doesn't have braces or is not another if statement + "beforeText": "^\\s+([^{i\\s]|i(?!f\\b))", + "action": { + "indent": "outdent" + } } ] } diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json index 7ad3622320e..81eeb5b5d96 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/e0aefd8205cc9d1bc7859cc5babbee0d833dca0f", + "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/8c7482b94b548eab56da64dbfb30b82589b3f747", "name": "TypeScript", "scopeName": "source.ts", "patterns": [ @@ -134,7 +134,7 @@ "name": "keyword.control.flow.ts" } }, - "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#expression" @@ -296,7 +296,7 @@ { "name": "meta.var.expr.ts", "begin": "(?=(?|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "patterns": [ { "include": "#comment" @@ -1805,7 +1873,7 @@ }, { "begin": "(?<=:)\\s*", - "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#expression" @@ -1966,7 +2034,7 @@ "name": "storage.type.namespace.ts" } }, - "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#comment" @@ -2003,7 +2071,7 @@ "name": "entity.name.type.alias.ts" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#comment" @@ -2021,7 +2089,7 @@ "name": "keyword.control.intrinsic.ts" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type" @@ -2035,7 +2103,7 @@ "name": "keyword.operator.assignment.ts" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type" @@ -2226,7 +2294,7 @@ "name": "keyword.control.default.ts" } }, - "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#interface-declaration" @@ -2238,7 +2306,7 @@ }, { "name": "meta.export.ts", - "begin": "(?:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=[,);}\\]=>:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type-arguments" @@ -3953,7 +4021,7 @@ "name": "keyword.operator.type.annotation.ts" } }, - "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "patterns": [ { "include": "#arrow-return-type-body" @@ -3967,7 +4035,7 @@ "name": "meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts" } }, - "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "contentName": "meta.arrow.ts meta.return.type.arrow.ts", "patterns": [ { diff --git a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json index 10b809d93b9..e516ea1a1fa 100644 --- a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json +++ b/extensions/typescript-basics/syntaxes/TypeScriptReact.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/e0aefd8205cc9d1bc7859cc5babbee0d833dca0f", + "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/8c7482b94b548eab56da64dbfb30b82589b3f747", "name": "TypeScriptReact", "scopeName": "source.tsx", "patterns": [ @@ -134,7 +134,7 @@ "name": "keyword.control.flow.tsx" } }, - "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#expression" @@ -299,7 +299,7 @@ { "name": "meta.var.expr.tsx", "begin": "(?=(?|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "patterns": [ { "include": "#comment" @@ -1808,7 +1876,7 @@ }, { "begin": "(?<=:)\\s*", - "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#expression" @@ -1969,7 +2037,7 @@ "name": "storage.type.namespace.tsx" } }, - "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#comment" @@ -2006,7 +2074,7 @@ "name": "entity.name.type.alias.tsx" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#comment" @@ -2024,7 +2092,7 @@ "name": "keyword.control.intrinsic.tsx" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type" @@ -2038,7 +2106,7 @@ "name": "keyword.operator.assignment.tsx" } }, - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type" @@ -2229,7 +2297,7 @@ "name": "keyword.control.default.tsx" } }, - "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#interface-declaration" @@ -2241,7 +2309,7 @@ }, { "name": "meta.export.tsx", - "begin": "(?:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", + "end": "(?=[,);}\\]=>:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|var|while)\\b))", "patterns": [ { "include": "#type-arguments" @@ -3904,7 +3972,7 @@ "name": "keyword.operator.type.annotation.tsx" } }, - "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "patterns": [ { "include": "#arrow-return-type-body" @@ -3918,7 +3986,7 @@ "name": "meta.arrow.tsx meta.return.type.arrow.tsx keyword.operator.type.annotation.tsx" } }, - "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))", + "end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)|(?:\\bawait\\s+(?:\\busing(?=\\s+(?!in\\b|of\\b(?!\\s*(?:of\\b|=)))[_$[:alpha:]])\\b)\\b)|const|import|enum|namespace|module|type|abstract|declare)\\s+))", "contentName": "meta.arrow.tsx meta.return.type.arrow.tsx", "patterns": [ { diff --git a/extensions/typescript-language-features/extension-browser.webpack.config.js b/extensions/typescript-language-features/extension-browser.webpack.config.js index 9b4880ab882..7e131117174 100644 --- a/extensions/typescript-language-features/extension-browser.webpack.config.js +++ b/extensions/typescript-language-features/extension-browser.webpack.config.js @@ -41,7 +41,7 @@ module.exports = [withBrowserDefaults({ patterns: [ { from: '../node_modules/typescript/lib/*.d.ts', - to: 'typescript/', + to: 'typescript/[name][ext]', }, { from: '../node_modules/typescript/lib/typesMap.json', diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json index 8451a6176f0..5f90ca1097e 100644 --- a/extensions/typescript-language-features/package.json +++ b/extensions/typescript-language-features/package.json @@ -35,7 +35,7 @@ "dependencies": { "@vscode/extension-telemetry": "0.7.5", "jsonc-parser": "^3.2.0", - "semver": "5.5.1", + "semver": "7.5.2", "vscode-tas-client": "^0.1.63", "@vscode/sync-api-client": "^0.7.2", "@vscode/sync-api-common": "^0.7.2", @@ -68,15 +68,6 @@ "main": "./out/extension", "browser": "./dist/browser/extension", "contributes": { - "walkthroughs": [ - { - "id": "tempNodejsWelcome", - "title": "tempNodejsTitle", - "description": "tempNodejsDescription", - "steps": [], - "when": "false" - } - ], "jsonValidation": [ { "fileMatch": "package.json", @@ -152,6 +143,12 @@ "title": "%configuration.typescript%", "order": 20, "properties": { + "typescript.experimental.aiQuickFix": { + "type": "boolean", + "default": false, + "description": "%typescript.experimental.aiQuickFix%", + "scope": "resource" + }, "typescript.tsdk": { "type": "string", "markdownDescription": "%typescript.tsdk.desc%", @@ -1241,14 +1238,17 @@ "description": "%configuration.suggest.objectLiteralMethodSnippets.enabled%", "scope": "resource" }, - "typescript.experimental.tsserver.web.enableProjectWideIntellisense": { + "typescript.tsserver.web.projectWideIntellisense.enabled": { "type": "boolean", - "default": false, - "description": "%typescript.experimental.tsserver.web.enableProjectWideIntellisense%", - "scope": "window", - "tags": [ - "experimental" - ] + "default": true, + "description": "%configuration.tsserver.web.projectWideIntellisense.enabled%", + "scope": "window" + }, + "typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors": { + "type": "boolean", + "default": true, + "description": "%configuration.tsserver.web.projectWideIntellisense.suppressSemanticErrors%", + "scope": "window" }, "typescript.preferGoToSourceDefinition": { "type": "boolean", @@ -1256,7 +1256,7 @@ "description": "%configuration.preferGoToSourceDefinition%", "scope": "window" }, - "javascript.preferGoToSourceDefinition": { + "javascript.preferGoToSourceDefinition": { "type": "boolean", "default": false, "description": "%configuration.preferGoToSourceDefinition%", @@ -1282,12 +1282,12 @@ }, { "command": "typescript.goToProjectConfig", - "title": "%goToProjectConfig.title%", + "title": "%typescript.goToProjectConfig.title%", "category": "TypeScript" }, { "command": "javascript.goToProjectConfig", - "title": "%goToProjectConfig.title%", + "title": "%javascript.goToProjectConfig.title%", "category": "JavaScript" }, { diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json index 20306b9e271..81260c405e1 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json @@ -8,6 +8,7 @@ "configuration.suggest.completeFunctionCalls": "Complete functions with their parameter signature.", "configuration.suggest.includeAutomaticOptionalChainCompletions": "Enable/disable showing completions on potentially undefined values that insert an optional chain call. Requires strict null checks to be enabled.", "configuration.suggest.includeCompletionsForImportStatements": "Enable/disable auto-import-style completions on partially-typed import statements.", + "typescript.experimental.aiQuickFix": "Enable/disable AI-assisted quick fixes. Requires an extension providing AI chat functionality.", "typescript.tsdk.desc": "Specifies the folder path to the tsserver and `lib*.d.ts` files under a TypeScript install to use for IntelliSense, for example: `./node_modules/typescript/lib`.\n\n- When specified as a user setting, the TypeScript version from `typescript.tsdk` automatically replaces the built-in TypeScript version.\n- When specified as a workspace setting, `typescript.tsdk` allows you to switch to use that workspace version of TypeScript for IntelliSense with the `TypeScript: Select TypeScript version` command.\n\nSee the [TypeScript documentation](https://code.visualstudio.com/docs/typescript/typescript-compiling#_using-newer-typescript-versions) for more detail about managing TypeScript versions.", "typescript.disableAutomaticTypeAcquisition": "Disables [automatic type acquisition](https://code.visualstudio.com/docs/nodejs/working-with-javascript#_typings-and-automatic-type-acquisition). Automatic type acquisition fetches `@types` packages from npm to improve IntelliSense for external libraries.", "typescript.enablePromptUseWorkspaceTsdk": "Enables prompting of users to use the TypeScript version configured in the workspace for Intellisense.", @@ -41,7 +42,8 @@ "format.semicolons.remove": "Remove unnecessary semicolons.", "format.indentSwitchCase": "Indent case clauses in switch statements. Requires using TypeScript 5.1+ in the workspace.", "javascript.validate.enable": "Enable/disable JavaScript validation.", - "goToProjectConfig.title": "Go to Project Configuration", + "javascript.goToProjectConfig.title": "Go to Project Configuration (jsconfig / tsconfig)", + "typescript.goToProjectConfig.title": "Go to Project Configuration (tsconfig)", "javascript.referencesCodeLens.enabled": "Enable/disable references CodeLens in JavaScript files.", "javascript.referencesCodeLens.showOnAllFunctions": "Enable/disable references CodeLens on all functions in JavaScript files.", "typescript.referencesCodeLens.enabled": "Enable/disable references CodeLens in TypeScript files.", @@ -87,29 +89,41 @@ "inlayHints.parameterNames.all": "Enable parameter name hints for literal and non-literal arguments.", "configuration.inlayHints.parameterNames.enabled": { "message": "Enable/disable inlay hints for parameter names:\n```typescript\n\nparseInt(/* str: */ '123', /* radix: */ 8)\n \n```", - "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.parameterNames.suppressWhenArgumentMatchesName": "Suppress parameter name hints on arguments whose text is identical to the parameter name.", "configuration.inlayHints.parameterTypes.enabled": { "message": "Enable/disable inlay hints for implicit parameter types:\n```typescript\n\nel.addEventListener('click', e /* :MouseEvent */ => ...)\n \n```", - "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```", - "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```", - "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```", - "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```", - "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.", @@ -138,7 +152,7 @@ "typescript.preferences.includePackageJsonAutoImports.auto": "Search dependencies based on estimated performance impact.", "typescript.preferences.includePackageJsonAutoImports.on": "Always search dependencies.", "typescript.preferences.includePackageJsonAutoImports.off": "Never search dependencies.", - "typescript.preferences.autoImportFileExcludePatterns": "Specify glob patterns of files to exclude from auto imports. Requires using TypeScript 4.8 or newer in the workspace.", + "typescript.preferences.autoImportFileExcludePatterns": "Specify glob patterns of files to exclude from auto imports. Relative paths are resolved relative to the workspace root. Patterns are evaluated using tsconfig.json [`exclude`](https://www.typescriptlang.org/tsconfig#exclude) semantics. Requires using TypeScript 4.8 or newer in the workspace.", "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.", "typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.", "typescript.updateImportsOnFileMove.enabled.always": "Always update paths automatically.", @@ -197,26 +211,6 @@ "typescript.goToSourceDefinition": "Go to Source Definition", "configuration.suggest.classMemberSnippets.enabled": "Enable/disable snippet completions for class members.", "configuration.suggest.objectLiteralMethodSnippets.enabled": "Enable/disable snippet completions for methods in object literals. Requires using TypeScript 4.7+ in the workspace.", - - "typescript.experimental.tsserver.web.enableProjectWideIntellisense": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.", - - "walkthroughs.nodejsWelcome.title": "Get started with JavaScript and Node.js", - "walkthroughs.nodejsWelcome.description": "Make the most of Visual Studio Code's first-class JavaScript experience.", - - "walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.title": "Install Node.js", - "walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.description": "Node.js is an easy way to run JavaScript code. You can use it to quickly build command-line apps and servers. It also comes with npm, a package manager which makes reusing and sharing JavaScript code easy.\n[Install Node.js](https://nodejs.org/en/download/)", - - "walkthroughs.nodejsWelcome.downloadNode.forLinux.title": "Install Node.js", - "walkthroughs.nodejsWelcome.downloadNode.forLinux.description": "Node.js is an easy way to run JavaScript code. You can use it to quickly build command-line apps and servers. It also comes with npm, a package manager which makes reusing and sharing JavaScript code easy.\n[Install Node.js](https://nodejs.org/en/download/package-manager/)", - - "walkthroughs.nodejsWelcome.makeJsFile.title": "Create a JavaScript File", - "walkthroughs.nodejsWelcome.makeJsFile.description": "Let's write our first JavaScript file. We'll have to create a new file and save it with the ``.js`` extension at the end of the file name.\n[Create a JavaScript File](command:javascript-walkthrough.commands.createJsFile)", - - "walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript", - "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)", - "walkthroughs.nodejsWelcome.debugJsFile.altText": "Debug and run your JavaScript code in Node.js with Visual Studio Code.", - - "walkthroughs.nodejsWelcome.learnMoreAboutJs.title": "Explore More", - "walkthroughs.nodejsWelcome.learnMoreAboutJs.description": "Want to get more comfortable with JavaScript, Node.js, and VS Code? Be sure to check out our docs!\nWe've got lots of resources for learning [JavaScript](https://code.visualstudio.com/docs/nodejs/working-with-javascript) and [Node.js](https://code.visualstudio.com/docs/nodejs/nodejs-tutorial).\n\n[Learn More](https://code.visualstudio.com/docs/nodejs/nodejs-tutorial)", - "walkthroughs.nodejsWelcome.learnMoreAboutJs.altText": "Learn more about JavaScript and Node.js in Visual Studio Code." + "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.", + "configuration.tsserver.web.projectWideIntellisense.suppressSemanticErrors": "Suppresses semantic errors. This is needed when using external packages as these can't be included analyzed on web." } diff --git a/extensions/typescript-language-features/src/configuration/configuration.ts b/extensions/typescript-language-features/src/configuration/configuration.ts index 4fb86157ce8..cab1cf4c819 100644 --- a/extensions/typescript-language-features/src/configuration/configuration.ts +++ b/extensions/typescript-language-features/src/configuration/configuration.ts @@ -110,7 +110,8 @@ export interface TypeScriptServiceConfiguration { readonly implicitProjectConfiguration: ImplicitProjectConfiguration; readonly disableAutomaticTypeAcquisition: boolean; readonly useSyntaxServer: SyntaxServerConfiguration; - readonly enableProjectWideIntellisenseOnWeb: boolean; + readonly webProjectWideIntellisenseEnabled: boolean; + readonly webProjectWideIntellisenseSuppressSemanticErrors: boolean; readonly enableProjectDiagnostics: boolean; readonly maxTsServerMemory: number; readonly enablePromptUseWorkspaceTsdk: boolean; @@ -141,7 +142,8 @@ export abstract class BaseServiceConfigurationProvider implements ServiceConfigu implicitProjectConfiguration: new ImplicitProjectConfiguration(configuration), disableAutomaticTypeAcquisition: this.readDisableAutomaticTypeAcquisition(configuration), useSyntaxServer: this.readUseSyntaxServer(configuration), - enableProjectWideIntellisenseOnWeb: this.readEnableProjectWideIntellisenseOnWeb(configuration), + webProjectWideIntellisenseEnabled: this.readWebProjectWideIntellisenseEnable(configuration), + webProjectWideIntellisenseSuppressSemanticErrors: this.readWebProjectWideIntellisenseSuppressSemanticErrors(configuration), enableProjectDiagnostics: this.readEnableProjectDiagnostics(configuration), maxTsServerMemory: this.readMaxTsServerMemory(configuration), enablePromptUseWorkspaceTsdk: this.readEnablePromptUseWorkspaceTsdk(configuration), @@ -227,7 +229,11 @@ export abstract class BaseServiceConfigurationProvider implements ServiceConfigu return configuration.get('typescript.tsserver.enableTracing', false); } - private readEnableProjectWideIntellisenseOnWeb(configuration: vscode.WorkspaceConfiguration): boolean { - return configuration.get('typescript.experimental.tsserver.web.enableProjectWideIntellisense', false); + private readWebProjectWideIntellisenseEnable(configuration: vscode.WorkspaceConfiguration): boolean { + return configuration.get('typescript.tsserver.web.projectWideIntellisense.enabled', true); + } + + private readWebProjectWideIntellisenseSuppressSemanticErrors(configuration: vscode.WorkspaceConfiguration): boolean { + return configuration.get('typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors', true); } } diff --git a/extensions/typescript-language-features/src/configuration/fileSchemes.ts b/extensions/typescript-language-features/src/configuration/fileSchemes.ts index b255f6de89c..9fb572c7175 100644 --- a/extensions/typescript-language-features/src/configuration/fileSchemes.ts +++ b/extensions/typescript-language-features/src/configuration/fileSchemes.ts @@ -10,6 +10,7 @@ export const file = 'file'; export const untitled = 'untitled'; export const git = 'git'; export const github = 'github'; +export const azurerepos = 'azurerepos'; /** Live share scheme */ export const vsls = 'vsls'; @@ -19,13 +20,18 @@ export const memFs = 'memfs'; export const vscodeVfs = 'vscode-vfs'; export const officeScript = 'office-script'; -export const semanticSupportedSchemes = isWeb() && vscode.workspace.workspaceFolders ? - vscode.workspace.workspaceFolders.map(folder => folder.uri.scheme) : [ +export function getSemanticSupportedSchemes() { + if (isWeb() && vscode.workspace.workspaceFolders) { + return vscode.workspace.workspaceFolders.map(folder => folder.uri.scheme); + } + + return [ file, untitled, walkThroughSnippet, vscodeNotebookCell, ]; +} /** * File scheme for which JS/TS language feature should be disabled @@ -34,4 +40,5 @@ export const disabledSchemes = new Set([ git, vsls, github, + azurerepos, ]); diff --git a/extensions/typescript-language-features/src/extension.browser.ts b/extensions/typescript-language-features/src/extension.browser.ts index 5098231005a..392a81f7922 100644 --- a/extensions/typescript-language-features/src/extension.browser.ts +++ b/extensions/typescript-language-features/src/extension.browser.ts @@ -23,6 +23,7 @@ import { Logger } from './logging/logger'; import { getPackageInfo } from './utils/packageInfo'; import { isWebAndHasSharedArrayBuffers } from './utils/platform'; import { PluginManager } from './tsServer/plugins'; +import { Disposable } from './utils/dispose'; class StaticVersionProvider implements ITypeScriptVersionProvider { @@ -59,7 +60,7 @@ export async function activate(context: vscode.ExtensionContext): Promise { new TypeScriptVersion( TypeScriptVersionSource.Bundled, vscode.Uri.joinPath(context.extensionUri, 'dist/browser/typescript/tsserver.web.js').toString(), - API.fromSimpleString('5.0.1'))); + API.fromSimpleString('5.1.3'))); let experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined; const packageInfo = getPackageInfo(context); @@ -78,7 +79,7 @@ export async function activate(context: vscode.ExtensionContext): Promise { logDirectoryProvider: noopLogDirectoryProvider, cancellerFactory: noopRequestCancellerFactory, versionProvider, - processFactory: new WorkerServerProcessFactory(context.extensionUri), + processFactory: new WorkerServerProcessFactory(context.extensionUri, logger), activeJsTsEditorTracker, serviceConfigurationProvider: new BrowserServiceConfigurationProvider(), experimentTelemetryReporter, @@ -96,34 +97,63 @@ export async function activate(context: vscode.ExtensionContext): Promise { }); context.subscriptions.push(lazilyActivateClient(lazyClientHost, pluginManager, activeJsTsEditorTracker, async () => { - await preload(logger); + await startPreloadWorkspaceContentsIfNeeded(context, logger); })); return getExtensionApi(onCompletionAccepted.event, pluginManager); } -async function preload(logger: Logger): Promise { +async function startPreloadWorkspaceContentsIfNeeded(context: vscode.ExtensionContext, logger: Logger): Promise { if (!isWebAndHasSharedArrayBuffers()) { return; } const workspaceUri = vscode.workspace.workspaceFolders?.[0].uri; - if (!workspaceUri || workspaceUri.scheme !== 'vscode-vfs' || workspaceUri.authority !== 'github') { - return undefined; + if (!workspaceUri || workspaceUri.scheme !== 'vscode-vfs' || !workspaceUri.authority.startsWith('github')) { + logger.info(`Skipped loading workspace contents for repository ${workspaceUri?.toString()}`); + return; } - try { - const remoteHubApi = await RemoteRepositories.getApi(); - if (remoteHubApi.loadWorkspaceContents !== undefined) { - if (await remoteHubApi.loadWorkspaceContents(workspaceUri)) { - logger.info(`Successfully loaded workspace content for repository ${workspaceUri.toString()}`); - } else { - logger.info(`Failed to load workspace content for repository ${workspaceUri.toString()}`); - } + const loader = new RemoteWorkspaceContentsPreloader(workspaceUri, logger); + context.subscriptions.push(loader); + return loader.triggerPreload(); +} +class RemoteWorkspaceContentsPreloader extends Disposable { + + private _preload: Promise | undefined; + + constructor( + private readonly workspaceUri: vscode.Uri, + private readonly logger: Logger, + ) { + super(); + + const fsWatcher = this._register(vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(workspaceUri, '*'))); + this._register(fsWatcher.onDidChange(uri => { + if (uri.toString() === workspaceUri.toString()) { + this._preload = undefined; + this.triggerPreload(); + } + })); + } + + async triggerPreload() { + this._preload ??= this.doPreload(); + return this._preload; + } + + private async doPreload(): Promise { + try { + const remoteHubApi = await RemoteRepositories.getApi(); + if (await remoteHubApi.loadWorkspaceContents?.(this.workspaceUri)) { + this.logger.info(`Successfully loaded workspace content for repository ${this.workspaceUri.toString()}`); + } else { + this.logger.info(`Failed to load workspace content for repository ${this.workspaceUri.toString()}`); + } + } catch (error) { + this.logger.info(`Loading workspace content for repository ${this.workspaceUri.toString()} failed: ${error instanceof Error ? error.toString() : 'Unknown reason'}`); + console.error(error); } - } catch (error) { - logger.info(`Loading workspace content for repository ${workspaceUri.toString()} failed: ${error instanceof Error ? error.toString() : 'Unknown reason'}`); - console.error(error); } } diff --git a/extensions/typescript-language-features/src/languageFeatures/completions.ts b/extensions/typescript-language-features/src/languageFeatures/completions.ts index 4628a1788c1..b97c9b8b3fb 100644 --- a/extensions/typescript-language-features/src/languageFeatures/completions.ts +++ b/extensions/typescript-language-features/src/languageFeatures/completions.ts @@ -31,7 +31,6 @@ interface DotAccessorContext { interface CompletionContext { readonly isNewIdentifierLocation: boolean; readonly isMemberCompletion: boolean; - readonly isInValidCommitCharacterContext: boolean; readonly dotAccessorContext?: DotAccessorContext; @@ -40,8 +39,6 @@ interface CompletionContext { readonly wordRange: vscode.Range | undefined; readonly line: string; - - readonly useFuzzyWordRangeLogic: boolean; } type ResolvedCompletionItem = { @@ -61,7 +58,8 @@ class MyCompletionItem extends vscode.CompletionItem { public readonly metadata: any | undefined, client: ITypeScriptServiceClient, ) { - super(tsEntry.name, MyCompletionItem.convertKind(tsEntry.kind)); + const label = tsEntry.name || (tsEntry.insertText ?? ''); + super(label, MyCompletionItem.convertKind(tsEntry.kind)); if (tsEntry.source && tsEntry.hasAction && client.apiVersion.lt(API.v490)) { // De-prioritze auto-imports @@ -75,18 +73,18 @@ class MyCompletionItem extends vscode.CompletionItem { // Render "fancy" when source is a workspace path const qualifierCandidate = vscode.workspace.asRelativePath(tsEntry.source); if (qualifierCandidate !== tsEntry.source) { - this.label = { label: tsEntry.name, description: qualifierCandidate }; + this.label = { label, description: qualifierCandidate }; } } const { sourceDisplay, isSnippet } = tsEntry; if (sourceDisplay) { - this.label = { label: tsEntry.name, description: Previewer.asPlainTextWithLinks(sourceDisplay, client) }; + this.label = { label, description: Previewer.asPlainTextWithLinks(sourceDisplay, client) }; } if (tsEntry.labelDetails) { - this.label = { label: tsEntry.name, ...tsEntry.labelDetails }; + this.label = { label, ...tsEntry.labelDetails }; } this.preselect = tsEntry.isRecommended; @@ -96,12 +94,12 @@ class MyCompletionItem extends vscode.CompletionItem { this.range = this.getRangeFromReplacementSpan(tsEntry, completionContext); this.commitCharacters = MyCompletionItem.getCommitCharacters(completionContext, tsEntry); this.insertText = isSnippet && tsEntry.insertText ? new vscode.SnippetString(tsEntry.insertText) : tsEntry.insertText; - this.filterText = this.getFilterText(completionContext.line, tsEntry.insertText); + this.filterText = tsEntry.filterText || this.getFilterText(completionContext.line, tsEntry.insertText); if (completionContext.isMemberCompletion && completionContext.dotAccessorContext && !(this.insertText instanceof vscode.SnippetString)) { this.filterText = completionContext.dotAccessorContext.text + (this.insertText || this.textLabel); if (!this.range) { - const replacementRange = this.getFuzzyWordRange(); + const replacementRange = this.completionContext.wordRange; if (replacementRange) { this.range = { inserting: completionContext.dotAccessorContext.range, @@ -422,7 +420,7 @@ class MyCompletionItem extends vscode.CompletionItem { return; } - const replaceRange = this.getFuzzyWordRange(); + const replaceRange = this.completionContext.wordRange; if (replaceRange) { this.range = { inserting: new vscode.Range(replaceRange.start, this.position), @@ -431,23 +429,6 @@ class MyCompletionItem extends vscode.CompletionItem { } } - private getFuzzyWordRange() { - if (this.completionContext.useFuzzyWordRangeLogic) { - // Try getting longer, prefix based range for completions that span words - const text = this.completionContext.line.slice(Math.max(0, this.position.character - this.textLabel.length), this.position.character).toLowerCase(); - const entryName = this.textLabel.toLowerCase(); - for (let i = entryName.length; i >= 0; --i) { - if (text.endsWith(entryName.substr(0, i)) && (!this.completionContext.wordRange || this.completionContext.wordRange.start.character > this.position.character - i)) { - return new vscode.Range( - new vscode.Position(this.position.line, Math.max(0, this.position.character - i)), - this.position); - } - } - } - - return this.completionContext.wordRange; - } - private static convertKind(kind: string): vscode.CompletionItemKind { switch (kind) { case PConst.Kind.primitiveType: @@ -516,7 +497,7 @@ class MyCompletionItem extends vscode.CompletionItem { return undefined; } - if (context.isNewIdentifierLocation || !context.isInValidCommitCharacterContext) { + if (context.isNewIdentifierLocation) { return undefined; } @@ -789,16 +770,14 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider< metadata = response.metadata; } - const completionContext = { + const completionContext: CompletionContext = { isNewIdentifierLocation, isMemberCompletion, dotAccessorContext, - isInValidCommitCharacterContext: this.isInValidCommitCharacterContext(document, position), enableCallCompletions: !completionConfiguration.completeFunctionCalls, wordRange, line: line.text, completeFunctionCalls: completionConfiguration.completeFunctionCalls, - useFuzzyWordRangeLogic: this.client.apiVersion.lt(API.v390), }; let includesPackageJsonImport = false; @@ -863,26 +842,27 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider< private getTsTriggerCharacter(context: vscode.CompletionContext): Proto.CompletionsTriggerCharacter | undefined { switch (context.triggerCharacter) { - case '@': // Workaround for https://github.com/microsoft/TypeScript/issues/27321 + case '@': { // Workaround for https://github.com/microsoft/TypeScript/issues/27321 return this.client.apiVersion.gte(API.v310) && this.client.apiVersion.lt(API.v320) ? undefined : '@'; - - case '#': // Workaround for https://github.com/microsoft/TypeScript/issues/36367 + } + case '#': { // Workaround for https://github.com/microsoft/TypeScript/issues/36367 return this.client.apiVersion.lt(API.v381) ? undefined : '#'; - + } case ' ': { - const space: Proto.CompletionsTriggerCharacter = ' '; - return this.client.apiVersion.gte(API.v430) ? space : undefined; + return this.client.apiVersion.gte(API.v430) ? ' ' : undefined; } case '.': case '"': case '\'': case '`': case '/': - case '<': + case '<': { return context.triggerCharacter; + } + default: { + return undefined; + } } - - return undefined; } public async resolveCompletionItem( @@ -893,25 +873,6 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider< return item; } - private isInValidCommitCharacterContext( - document: vscode.TextDocument, - position: vscode.Position - ): boolean { - if (this.client.apiVersion.lt(API.v320)) { - // Workaround for https://github.com/microsoft/TypeScript/issues/27742 - // Only enable dot completions when previous character not a dot preceded by whitespace. - // Prevents incorrectly completing while typing spread operators. - if (position.character > 1) { - const preText = document.getText(new vscode.Range( - position.line, 0, - position.line, position.character)); - return preText.match(/(\s|^)\.$/ig) === null; - } - } - - return true; - } - private shouldTrigger( context: vscode.CompletionContext, line: vscode.TextLine, diff --git a/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts b/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts index bd1eecd3f82..aeb4491872e 100644 --- a/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts +++ b/extensions/typescript-language-features/src/languageFeatures/diagnostics.ts @@ -170,7 +170,7 @@ export class DiagnosticsManager extends Disposable { public override dispose() { super.dispose(); - for (const value of this._pendingUpdates.values) { + for (const value of this._pendingUpdates.values()) { clearTimeout(value); } this._pendingUpdates.clear(); @@ -259,7 +259,7 @@ export class DiagnosticsManager extends Disposable { private rebuildAll(): void { this._currentDiagnostics.clear(); - for (const fileDiagnostic of this._diagnostics.values) { + for (const fileDiagnostic of this._diagnostics.values()) { this.rebuildFile(fileDiagnostic); } } diff --git a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts index ebf0131fced..e3ef52002a5 100644 --- a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts +++ b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts @@ -195,6 +195,7 @@ export default class FileConfigurationManager extends Disposable { allowIncompleteCompletions: true, displayPartsForJSDoc: true, disableLineTextInReferences: true, + interactiveInlayHints: true, ...getInlayHintsPreferences(config), }; diff --git a/extensions/typescript-language-features/src/languageFeatures/inlayHints.ts b/extensions/typescript-language-features/src/languageFeatures/inlayHints.ts index 263f8f3bd72..fb08f68dc42 100644 --- a/extensions/typescript-language-features/src/languageFeatures/inlayHints.ts +++ b/extensions/typescript-language-features/src/languageFeatures/inlayHints.ts @@ -8,7 +8,7 @@ import { DocumentSelector } from '../configuration/documentSelector'; import { LanguageDescription } from '../configuration/languageDescription'; import { API } from '../tsServer/api'; import type * as Proto from '../tsServer/protocol/protocol'; -import { Position } from '../typeConverters'; +import { Location, Position } from '../typeConverters'; import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService'; import { Disposable } from '../utils/dispose'; import FileConfigurationManager, { InlayHintSettingNames, getInlayHintsPreferences } from './fileConfigurationManager'; @@ -77,7 +77,7 @@ class TypeScriptInlayHintsProvider extends Disposable implements vscode.InlayHin return response.body.map(hint => { const result = new vscode.InlayHint( Position.fromLocation(hint.position), - hint.text, + this.convertInlayHintText(model.uri, hint), hint.kind && fromProtocolInlayHintKind(hint.kind) ); result.paddingLeft = hint.whitespaceBefore; @@ -85,6 +85,20 @@ class TypeScriptInlayHintsProvider extends Disposable implements vscode.InlayHin return result; }); } + + private convertInlayHintText(resource: vscode.Uri, tsHint: Proto.InlayHintItem): string | vscode.InlayHintLabelPart[] { + if (typeof tsHint.text === 'string') { + return tsHint.text; + } + + return tsHint.text.map((part): vscode.InlayHintLabelPart => { + const out = new vscode.InlayHintLabelPart(part.text); + if (part.span) { + out.location = Location.fromTextSpan(resource, part.span); + } + return out; + }); + } } function fromProtocolInlayHintKind(kind: Proto.InlayHintKind): vscode.InlayHintKind | undefined { diff --git a/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts b/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts index 7da9129cff5..f2c1b49c67f 100644 --- a/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts +++ b/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts @@ -103,7 +103,7 @@ class JsDocCompletionProvider implements vscode.CompletionItemProvider { export function templateToSnippet(template: string): vscode.SnippetString { // TODO: use append placeholder let snippetIndex = 1; - template = template.replace(/\$/g, '\\$'); + template = template.replace(/\$/g, '\\$'); // CodeQL [SM02383] This is only used for text which is put into the editor. It is not for rendered html template = template.replace(/^[ \t]*(?=(\/|[ ]\*))/gm, ''); template = template.replace(/^(\/\*\*\s*\*[ ]*)$/m, (x) => x + `\$0`); template = template.replace(/\* @param([ ]\{\S+\})?\s+(\S+)[ \t]*$/gm, (_param, type, post) => { diff --git a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts index 515402f6e1e..bc2442046aa 100644 --- a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts +++ b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts @@ -20,11 +20,48 @@ import { applyCodeActionCommands, getEditForCodeAction } from './util/codeAction import { conditionalRegistration, requireSomeCapability } from './util/dependentRegistration'; type ApplyCodeActionCommand_args = { - readonly resource: vscode.Uri; + readonly document: vscode.TextDocument; readonly diagnostic: vscode.Diagnostic; readonly action: Proto.CodeFixAction; + readonly followupAction?: Command; }; +class EditorChatFollowUp implements Command { + + id: string = '_typescript.quickFix.editorChatFollowUp'; + + constructor(private readonly prompt: string, private readonly document: vscode.TextDocument, private readonly range: vscode.Range, private readonly client: ITypeScriptServiceClient) { + } + + async execute() { + const findScopeEndLineFromNavTree = (startLine: number, navigationTree: Proto.NavigationTree[]): vscode.Range | undefined => { + for (const node of navigationTree) { + const range = typeConverters.Range.fromTextSpan(node.spans[0]); + if (startLine === range.start.line) { + return range; + } else if (startLine > range.start.line && startLine <= range.end.line && node.childItems) { + return findScopeEndLineFromNavTree(startLine, node.childItems); + } + } + return undefined; + }; + const filepath = this.client.toOpenTsFilePath(this.document); + if (!filepath) { + return; + } + const response = await this.client.execute('navtree', { file: filepath }, nulToken); + if (response.type !== 'response' || !response.body?.childItems) { + return; + } + const startLine = this.range.start.line; + const enclosingRange = findScopeEndLineFromNavTree(startLine, response.body.childItems); + if (!enclosingRange) { + return; + } + await vscode.commands.executeCommand('vscode.editorChat.start', { initialRange: enclosingRange, message: this.prompt, autoSend: true }); + } +} + class ApplyCodeActionCommand implements Command { public static readonly ID = '_typescript.applyCodeActionCommand'; public readonly id = ApplyCodeActionCommand.ID; @@ -35,7 +72,7 @@ class ApplyCodeActionCommand implements Command { private readonly telemetryReporter: TelemetryReporter, ) { } - public async execute({ resource, action, diagnostic }: ApplyCodeActionCommand_args): Promise { + public async execute({ document, action, diagnostic, followupAction }: ApplyCodeActionCommand_args): Promise { /* __GDPR__ "quickFix.execute" : { "owner": "mjbvz", @@ -49,8 +86,10 @@ class ApplyCodeActionCommand implements Command { fixName: action.fixName }); - this.diagnosticManager.deleteDiagnostic(resource, diagnostic); - return applyCodeActionCommands(this.client, action.commands, nulToken); + this.diagnosticManager.deleteDiagnostic(document.uri, diagnostic); + const codeActionResult = await applyCodeActionCommands(this.client, action.commands, nulToken); + await followupAction?.execute(); + return codeActionResult; } } @@ -313,22 +352,27 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider{ action: tsAction, diagnostic, resource }], + arguments: [{ action: tsAction, diagnostic, document, followupAction }], title: '' }; return codeAction; diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts index 98553ef0ba2..a99b92685fc 100644 --- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts +++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts @@ -109,7 +109,7 @@ class SelectRefactorCommand implements Command { await tsAction.resolve(nulToken); if (tsAction.edit) { - if (!(await vscode.workspace.applyEdit(tsAction.edit))) { + if (!(await vscode.workspace.applyEdit(tsAction.edit, { isRefactoring: true }))) { vscode.window.showErrorMessage(vscode.l10n.t("Could not apply refactoring")); return; } @@ -145,7 +145,7 @@ class MoveToFileRefactorCommand implements Command { } const targetFile = await this.getTargetFile(args.document, file, args.range); - if (!targetFile) { + if (!targetFile || targetFile.toString() === file.toString()) { return; } @@ -161,7 +161,7 @@ class MoveToFileRefactorCommand implements Command { return; } const edit = toWorkspaceEdit(this.client, response.body.edits); - if (!(await vscode.workspace.applyEdit(edit))) { + if (!(await vscode.workspace.applyEdit(edit, { isRefactoring: true }))) { vscode.window.showErrorMessage(vscode.l10n.t("Could not apply refactoring")); return; } @@ -175,7 +175,6 @@ class MoveToFileRefactorCommand implements Command { if (response.type !== 'response' || !response.body) { return; } - const defaultUri = vscode.Uri.joinPath(Utils.dirname(document.uri), response.body.newFileName); const selectExistingFileItem: vscode.QuickPickItem = { label: vscode.l10n.t("Select existing file..."), @@ -226,14 +225,14 @@ class MoveToFileRefactorCommand implements Command { const picked = await vscode.window.showOpenDialog({ title: vscode.l10n.t("Select move destination"), openLabel: vscode.l10n.t("Move to File"), - defaultUri + defaultUri: Utils.dirname(document.uri), }); return picked?.length ? this.client.toTsFilePath(picked[0]) : undefined; } else if (picked === selectNewFileItem) { const picked = await vscode.window.showSaveDialog({ title: vscode.l10n.t("Select move destination"), saveLabel: vscode.l10n.t("Move to File"), - defaultUri, + defaultUri: this.client.toResource(response.body.newFileName), }); return picked ? this.client.toTsFilePath(picked) : undefined; } else { @@ -481,7 +480,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider(node: jsonc.Node | undefined, f: (x: jsonc.Node) => R): R[] { return node && node.type === 'array' && node.children @@ -42,23 +42,31 @@ class TsconfigLinkProvider implements vscode.DocumentLinkProvider { } private getExtendsLink(document: vscode.TextDocument, root: jsonc.Node): vscode.DocumentLink | undefined { - const extendsNode = jsonc.findNodeAtLocation(root, ['extends']); - if (!this.isPathValue(extendsNode)) { - return undefined; - } + const node = jsonc.findNodeAtLocation(root, ['extends']); + return node && this.tryCreateTsConfigLink(document, node); + } - const extendsValue: string = extendsNode.value; - if (extendsValue.startsWith('/')) { + private getReferencesLinks(document: vscode.TextDocument, root: jsonc.Node) { + return mapChildren( + jsonc.findNodeAtLocation(root, ['references']), + child => { + const pathNode = jsonc.findNodeAtLocation(child, ['path']); + return pathNode && this.tryCreateTsConfigLink(document, pathNode); + }); + } + + private tryCreateTsConfigLink(document: vscode.TextDocument, node: jsonc.Node): vscode.DocumentLink | undefined { + if (!this.isPathValue(node)) { return undefined; } const args: OpenExtendsLinkCommandArgs = { - resourceUri: { ...document.uri.toJSON(), $mid: undefined }, // Prevent VS Code from trying to transform the uri - extendsValue: extendsValue + resourceUri: { ...document.uri.toJSON(), $mid: undefined }, + extendsValue: node.value }; const link = new vscode.DocumentLink( - this.getRange(document, extendsNode), + this.getRange(document, node), vscode.Uri.parse(`command:${openExtendsLinkCommandId}?${JSON.stringify(args)}`)); link.tooltip = vscode.l10n.t("Follow link"); return link; @@ -70,22 +78,6 @@ class TsconfigLinkProvider implements vscode.DocumentLinkProvider { child => this.pathNodeToLink(document, child)); } - private getReferencesLinks(document: vscode.TextDocument, root: jsonc.Node) { - return mapChildren( - jsonc.findNodeAtLocation(root, ['references']), - child => { - const pathNode = jsonc.findNodeAtLocation(child, ['path']); - if (!this.isPathValue(pathNode)) { - return undefined; - } - - return new vscode.DocumentLink(this.getRange(document, pathNode), - basename(pathNode.value).endsWith('.json') - ? this.getFileTarget(document, pathNode) - : this.getFolderTarget(document, pathNode)); - }); - } - private pathNodeToLink( document: vscode.TextDocument, node: jsonc.Node | undefined @@ -95,21 +87,17 @@ class TsconfigLinkProvider implements vscode.DocumentLinkProvider { : undefined; } - private isPathValue(extendsNode: jsonc.Node | undefined): extendsNode is jsonc.Node { - return extendsNode - && extendsNode.type === 'string' - && extendsNode.value - && !(extendsNode.value as string).includes('*'); // don't treat globs as links. + private isPathValue(node: jsonc.Node | undefined): node is jsonc.Node { + return node + && node.type === 'string' + && node.value + && !(node.value as string).includes('*'); // don't treat globs as links. } private getFileTarget(document: vscode.TextDocument, node: jsonc.Node): vscode.Uri { return vscode.Uri.joinPath(Utils.dirname(document.uri), node.value); } - private getFolderTarget(document: vscode.TextDocument, node: jsonc.Node): vscode.Uri { - return vscode.Uri.joinPath(Utils.dirname(document.uri), node.value, 'tsconfig.json'); - } - private getRange(document: vscode.TextDocument, node: jsonc.Node) { const offset = node.offset; const start = document.positionAt(offset + 1); @@ -160,14 +148,9 @@ async function resolveNodeModulesPath(baseDirUri: vscode.Uri, pathCandidates: st /** * @returns Returns undefined in case of lack of result while trying to resolve from node_modules */ -async function getTsconfigPath(baseDirUri: vscode.Uri, extendsValue: string): Promise { - // Don't take into account a case, where tsconfig might be resolved from the root (see the reference) - // e.g. C:/projects/shared-tsconfig/tsconfig.json (note that C: prefix is optional) - - const isRelativePath = ['./', '../'].some(str => extendsValue.startsWith(str)); - if (isRelativePath) { - const absolutePath = vscode.Uri.joinPath(baseDirUri, extendsValue); - if (await exists(absolutePath) || absolutePath.path.endsWith('.json')) { +async function getTsconfigPath(baseDirUri: vscode.Uri, pathValue: string): Promise { + async function resolve(absolutePath: vscode.Uri): Promise { + if (absolutePath.path.endsWith('.json') || await exists(absolutePath)) { return absolutePath; } return absolutePath.with({ @@ -175,12 +158,21 @@ async function getTsconfigPath(baseDirUri: vscode.Uri, extendsValue: string): Pr }); } + const isRelativePath = ['./', '../'].some(str => pathValue.startsWith(str)); + if (isRelativePath) { + return resolve(vscode.Uri.joinPath(baseDirUri, pathValue)); + } + + if (pathValue.startsWith('/') || looksLikeAbsoluteWindowsPath(pathValue)) { + return resolve(vscode.Uri.file(pathValue)); + } + // Otherwise resolve like a module return resolveNodeModulesPath(baseDirUri, [ - extendsValue, - ...extendsValue.endsWith('.json') ? [] : [ - `${extendsValue}.json`, - `${extendsValue}/tsconfig.json`, + pathValue, + ...pathValue.endsWith('.json') ? [] : [ + `${pathValue}.json`, + `${pathValue}/tsconfig.json`, ] ]); } diff --git a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts index 1d55938685d..0d4da5b39a5 100644 --- a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts +++ b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts @@ -239,7 +239,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable { for (const rename of renames) { // Group renames by type (js/ts) and by workspace. - const key = `${this.client.getWorkspaceRootForResource(rename.jsTsFileThatIsBeingMoved)}@@@${doesResourceLookLikeATypeScriptFile(rename.jsTsFileThatIsBeingMoved)}`; + const key = `${this.client.getWorkspaceRootForResource(rename.jsTsFileThatIsBeingMoved)?.fsPath}@@@${doesResourceLookLikeATypeScriptFile(rename.jsTsFileThatIsBeingMoved)}`; if (!groups.has(key)) { groups.set(key, new Set()); } diff --git a/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts b/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts index 4eef8c1b963..fe26dd64029 100644 --- a/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts +++ b/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts @@ -49,9 +49,13 @@ function getTagBodyText( return '```\n' + text + '\n```'; } - const text = convertLinkTags(tag.text, filePathConverter); + let text = convertLinkTags(tag.text, filePathConverter); switch (tag.name) { case 'example': { + // Example text does not support `{@link}` as it is considered code. + // TODO: should we support it if it appears outside of an explicit code block? + text = asPlainText(tag.text); + // check for caption tags, fix for #79704 const captionTagMatches = text.match(/(.*?)<\/caption>\s*(\r\n|\n)/); if (captionTagMatches && captionTagMatches.index === 0) { @@ -132,6 +136,13 @@ function getTagBody(tag: Proto.JSDocTagInfo, filePathConverter: IFilePathToResou return (convertLinkTags(tag.text, filePathConverter)).split(/^(\S+)\s*-?\s*/); } +function asPlainText(parts: readonly Proto.SymbolDisplayPart[] | string): string { + if (typeof parts === 'string') { + return parts; + } + return parts.map(part => part.text).join(''); +} + export function asPlainTextWithLinks( parts: readonly Proto.SymbolDisplayPart[] | string, filePathConverter: IFilePathToResourceConverter, @@ -177,10 +188,10 @@ function convertLinkTags( if (/^https?:/.test(text)) { const parts = text.split(' '); if (parts.length === 1) { - out.push(parts[0]); + out.push(`<${parts[0]}>`); } else if (parts.length > 1) { - const linkText = escapeMarkdownSyntaxTokensForCode(parts.slice(1).join(' ')); - out.push(`[${currentLink.linkcode ? '`' + linkText + '`' : linkText}](${parts[0]})`); + const linkText = parts.slice(1).join(' '); + out.push(`[${currentLink.linkcode ? '`' + escapeMarkdownSyntaxTokensForCode(linkText) + '`' : linkText}](${parts[0]})`); } } else { out.push(escapeMarkdownSyntaxTokensForCode(text)); @@ -217,7 +228,7 @@ function convertLinkTags( } function escapeMarkdownSyntaxTokensForCode(text: string): string { - return text.replace(/`/g, '\\$&'); + return text.replace(/`/g, '\\$&'); // CodeQL [SM02383] This is only meant to escape backticks. The Markdown is fully sanitized after being rendered. } export function tagsToMarkdown( diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts index f978c800c95..1de34c6998c 100644 --- a/extensions/typescript-language-features/src/languageProvider.ts +++ b/extensions/typescript-language-features/src/languageProvider.ts @@ -6,17 +6,18 @@ import { basename, extname } from 'path'; import * as vscode from 'vscode'; import { CommandManager } from './commands/commandManager'; +import { DocumentSelector } from './configuration/documentSelector'; +import * as fileSchemes from './configuration/fileSchemes'; +import { LanguageDescription } from './configuration/languageDescription'; import { DiagnosticKind } from './languageFeatures/diagnostics'; import FileConfigurationManager from './languageFeatures/fileConfigurationManager'; +import { TelemetryReporter } from './logging/telemetry'; import { CachedResponse } from './tsServer/cachedResponse'; import { ClientCapability } from './typescriptService'; import TypeScriptServiceClient from './typescriptServiceClient'; import TypingsStatus from './ui/typingsStatus'; import { Disposable } from './utils/dispose'; -import { DocumentSelector } from './configuration/documentSelector'; -import * as fileSchemes from './configuration/fileSchemes'; -import { LanguageDescription } from './configuration/languageDescription'; -import { TelemetryReporter } from './logging/telemetry'; +import { isWeb } from './utils/platform'; const validateSetting = 'validate.enable'; @@ -45,7 +46,7 @@ export default class LanguageProvider extends Disposable { const syntax: vscode.DocumentFilter[] = []; for (const language of this.description.languageIds) { syntax.push({ language }); - for (const scheme of fileSchemes.semanticSupportedSchemes) { + for (const scheme of fileSchemes.getSemanticSupportedSchemes()) { semantic.push({ language, scheme }); } } @@ -139,6 +140,10 @@ export default class LanguageProvider extends Disposable { return; } + if (diagnosticsKind === DiagnosticKind.Semantic && isWeb() && this.client.configuration.webProjectWideIntellisenseSuppressSemanticErrors) { + return; + } + const config = vscode.workspace.getConfiguration(this.id, file); const reportUnnecessary = config.get('showUnused', true); const reportDeprecated = config.get('showDeprecated', true); diff --git a/extensions/typescript-language-features/src/test/unit/textRendering.test.ts b/extensions/typescript-language-features/src/test/unit/textRendering.test.ts index 2354bb7f589..b13f682f715 100644 --- a/extensions/typescript-language-features/src/test/unit/textRendering.test.ts +++ b/extensions/typescript-language-features/src/test/unit/textRendering.test.ts @@ -14,7 +14,7 @@ const noopToResource: IFilePathToResourceConverter = { }; suite('typescript.previewer', () => { - test('Should ignore hyphens after a param tag', async () => { + test('Should ignore hyphens after a param tag', () => { assert.strictEqual( tagsToMarkdown([ { @@ -25,7 +25,7 @@ suite('typescript.previewer', () => { '*@param* `a` ā€” b'); }); - test('Should parse url jsdoc @link', async () => { + test('Should parse url jsdoc @link', () => { assert.strictEqual( documentationToMarkdown( 'x {@link http://www.example.com/foo} y {@link https://api.jquery.com/bind/#bind-eventType-eventData-handler} z', @@ -35,7 +35,7 @@ suite('typescript.previewer', () => { 'x [http://www.example.com/foo](http://www.example.com/foo) y [https://api.jquery.com/bind/#bind-eventType-eventData-handler](https://api.jquery.com/bind/#bind-eventType-eventData-handler) z'); }); - test('Should parse url jsdoc @link with text', async () => { + test('Should parse url jsdoc @link with text', () => { assert.strictEqual( documentationToMarkdown( 'x {@link http://www.example.com/foo abc xyz} y {@link http://www.example.com/bar|b a z} z', @@ -45,7 +45,7 @@ suite('typescript.previewer', () => { 'x [abc xyz](http://www.example.com/foo) y [b a z](http://www.example.com/bar) z'); }); - test('Should treat @linkcode jsdocs links as monospace', async () => { + test('Should treat @linkcode jsdocs links as monospace', () => { assert.strictEqual( documentationToMarkdown( 'x {@linkcode http://www.example.com/foo} y {@linkplain http://www.example.com/bar} z', @@ -55,7 +55,7 @@ suite('typescript.previewer', () => { 'x [`http://www.example.com/foo`](http://www.example.com/foo) y [http://www.example.com/bar](http://www.example.com/bar) z'); }); - test('Should parse url jsdoc @link in param tag', async () => { + test('Should parse url jsdoc @link in param tag', () => { assert.strictEqual( tagsToMarkdown([ { @@ -66,7 +66,7 @@ suite('typescript.previewer', () => { '*@param* `a` ā€” x [abc xyz](http://www.example.com/foo) y [b a z](http://www.example.com/bar) z'); }); - test('Should ignore unclosed jsdocs @link', async () => { + test('Should ignore unclosed jsdocs @link', () => { assert.strictEqual( documentationToMarkdown( 'x {@link http://www.example.com/foo y {@link http://www.example.com/bar bar} z', @@ -76,7 +76,7 @@ suite('typescript.previewer', () => { 'x {@link http://www.example.com/foo y [bar](http://www.example.com/bar) z'); }); - test('Should support non-ascii characters in parameter name (#90108)', async () => { + test('Should support non-ascii characters in parameter name (#90108)', () => { assert.strictEqual( tagsToMarkdown([ { @@ -135,7 +135,35 @@ suite('typescript.previewer', () => { ); }); - test('Should render @linkcode symbol name as code', async () => { + test('Should not render @link inside of @example #187768', () => { + assert.strictEqual( + tagsToMarkdown([ + { + "name": "example", + "text": [ + { + "text": "1 + 1 ", + "kind": "text" + }, + { + "text": "{@link ", + "kind": "link" + }, + { + "text": "foo", + "kind": "linkName" + }, + { + "text": "}", + "kind": "link" + } + ] + } + ], noopToResource), + '*@example* \n```\n1 + 1 {@link foo}\n```'); + }); + + test('Should render @linkcode symbol name as code', () => { assert.strictEqual( asPlainTextWithLinks([ { "text": "a ", "kind": "text" }, @@ -155,7 +183,7 @@ suite('typescript.previewer', () => { 'a [`dog`](command:_typescript.openJsDocLink?%5B%7B%22file%22%3A%7B%22path%22%3A%22%2Fpath%2Ffile.ts%22%2C%22scheme%22%3A%22file%22%7D%2C%22position%22%3A%7B%22line%22%3A6%2C%22character%22%3A4%7D%7D%5D) b'); }); - test('Should render @linkcode text as code', async () => { + test('Should render @linkcode text as code', () => { assert.strictEqual( asPlainTextWithLinks([ { "text": "a ", "kind": "text" }, diff --git a/extensions/typescript-language-features/src/tsServer/api.ts b/extensions/typescript-language-features/src/tsServer/api.ts index 88156ee8664..cc90cad37af 100644 --- a/extensions/typescript-language-features/src/tsServer/api.ts +++ b/extensions/typescript-language-features/src/tsServer/api.ts @@ -35,6 +35,7 @@ export class API { public static readonly v480 = API.fromSimpleString('4.8.0'); public static readonly v490 = API.fromSimpleString('4.9.0'); public static readonly v510 = API.fromSimpleString('5.1.0'); + public static readonly v520 = API.fromSimpleString('5.2.0'); public static fromVersionString(versionString: string): API { let version = semver.valid(versionString); diff --git a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts index a38b67f0a02..90151ea6a08 100644 --- a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts +++ b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts @@ -4,10 +4,11 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { vscodeNotebookCell } from '../configuration/fileSchemes'; +import { officeScript, vscodeNotebookCell } from '../configuration/fileSchemes'; import * as languageModeIds from '../configuration/languageIds'; import * as typeConverters from '../typeConverters'; import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService'; +import { inMemoryResourcePrefix } from '../typescriptServiceClient'; import { coalesce } from '../utils/arrays'; import { Delayer, setImmediate } from '../utils/async'; import { nulToken } from '../utils/cancellation'; @@ -16,17 +17,6 @@ import { ResourceMap } from '../utils/resourceMap'; import { API } from './api'; import type * as Proto from './protocol/protocol'; -const enum BufferLanguage { - TypeScript = 1, - JavaScript = 2, -} - -const enum BufferState { - Initial = 1, - Open = 2, - Closed = 2, -} - type ScriptKind = 'TS' | 'TSX' | 'JS' | 'JSX'; function mode2ScriptKind(mode: string): ScriptKind | undefined { @@ -39,6 +29,8 @@ function mode2ScriptKind(mode: string): ScriptKind | undefined { return undefined; } +const enum BufferState { Initial, Open, Closed } + const enum BufferOperationType { Close, Open, Change } class CloseOperation { @@ -154,7 +146,7 @@ class BufferSynchronizer { const closedFiles: string[] = []; const openFiles: Proto.OpenRequestArgs[] = []; const changedFiles: Proto.FileCodeEdits[] = []; - for (const change of this._pending.values) { + for (const change of this._pending.values()) { switch (change.type) { case BufferOperationType.Change: changedFiles.push(change.args); break; case BufferOperationType.Open: openFiles.push(change.args); break; @@ -209,7 +201,7 @@ class SyncedBuffer { const args: Proto.OpenRequestArgs = { file: this.filepath, fileContent: this.document.getText(), - projectRootPath: this.client.getWorkspaceRootForResource(this.document.uri), + projectRootPath: this.getProjectRootPath(this.document.uri), }; const scriptKind = mode2ScriptKind(this.document.languageId); @@ -228,6 +220,16 @@ class SyncedBuffer { this.state = BufferState.Open; } + private getProjectRootPath(resource: vscode.Uri): string | undefined { + const workspaceRoot = this.client.getWorkspaceRootForResource(resource); + if (workspaceRoot) { + const tsRoot = this.client.toTsFilePath(workspaceRoot); + return tsRoot?.startsWith(inMemoryResourcePrefix) ? undefined : tsRoot; + } + + return resource.scheme === officeScript ? '/' : undefined; + } + public get resource(): vscode.Uri { return this.document.uri; } @@ -236,17 +238,8 @@ class SyncedBuffer { return this.document.lineCount; } - public get language(): BufferLanguage { - switch (this.document.languageId) { - case languageModeIds.javascript: - case languageModeIds.javascriptreact: - return BufferLanguage.JavaScript; - - case languageModeIds.typescript: - case languageModeIds.typescriptreact: - default: - return BufferLanguage.TypeScript; - } + public get languageId(): string { + return this.document.languageId; } /** @@ -277,13 +270,13 @@ class SyncedBufferMap extends ResourceMap { } public get allBuffers(): Iterable { - return this.values; + return this.values(); } } class PendingDiagnostics extends ResourceMap { public getOrderedFileSet(): ResourceMap { - const orderedResources = Array.from(this.entries) + const orderedResources = Array.from(this.entries()) .sort((a, b) => a.value - b.value) .map(entry => entry.resource); @@ -320,7 +313,7 @@ class GetErrRequest { } const supportsSyntaxGetErr = this.client.apiVersion.gte(API.v440); - const allFiles = coalesce(Array.from(files.entries) + const allFiles = coalesce(Array.from(files.entries()) .filter(entry => supportsSyntaxGetErr || client.hasCapabilityForResource(entry.resource, ClientCapability.Semantic)) .map(entry => client.toTsFilePath(entry.resource))); @@ -462,8 +455,9 @@ export default class BufferSyncSupport extends Disposable { private readonly client: ITypeScriptServiceClient; - private _validateJavaScript: boolean = true; - private _validateTypeScript: boolean = true; + private _validateJavaScript = true; + private _validateTypeScript = true; + private readonly modeIds: Set; private readonly syncedBuffers: SyncedBufferMap; private readonly pendingDiagnostics: PendingDiagnostics; @@ -717,7 +711,7 @@ export default class BufferSyncSupport extends Disposable { if (this.pendingGetErr) { this.pendingGetErr.cancel(); - for (const { resource } of this.pendingGetErr.files.entries) { + for (const { resource } of this.pendingGetErr.files.entries()) { if (this.syncedBuffers.get(resource)) { orderedFileSet.set(resource, undefined); } @@ -727,7 +721,7 @@ export default class BufferSyncSupport extends Disposable { } // Add all open TS buffers to the geterr request. They might be visible - for (const buffer of this.syncedBuffers.values) { + for (const buffer of this.syncedBuffers.values()) { orderedFileSet.set(buffer.resource, undefined); } @@ -755,11 +749,13 @@ export default class BufferSyncSupport extends Disposable { return false; } - switch (buffer.language) { - case BufferLanguage.JavaScript: + switch (buffer.languageId) { + case languageModeIds.javascript: + case languageModeIds.javascriptreact: return this._validateJavaScript; - case BufferLanguage.TypeScript: + case languageModeIds.typescript: + case languageModeIds.typescriptreact: default: return this._validateTypeScript; } diff --git a/extensions/typescript-language-features/src/tsServer/fileWatchingManager.ts b/extensions/typescript-language-features/src/tsServer/fileWatchingManager.ts index bc4f6d5b973..27b9ec3d7f6 100644 --- a/extensions/typescript-language-features/src/tsServer/fileWatchingManager.ts +++ b/extensions/typescript-language-features/src/tsServer/fileWatchingManager.ts @@ -6,31 +6,52 @@ import * as vscode from 'vscode'; import { Utils } from 'vscode-uri'; import { Schemes } from '../configuration/schemes'; +import { Logger } from '../logging/logger'; import { disposeAll, IDisposable } from '../utils/dispose'; import { ResourceMap } from '../utils/resourceMap'; -type DirWatcherEntry = { +interface DirWatcherEntry { readonly uri: vscode.Uri; readonly listeners: IDisposable[]; -}; +} -export class FileWatcherManager { +export class FileWatcherManager implements IDisposable { private readonly _fileWatchers = new Map(); private readonly _dirWatchers = new ResourceMap<{ + readonly uri: vscode.Uri; readonly watcher: vscode.FileSystemWatcher; refCount: number; }>(uri => uri.toString(), { onCaseInsensitiveFileSystem: false }); + constructor( + private readonly logger: Logger, + ) { } + + dispose(): void { + for (const entry of this._fileWatchers.values()) { + entry.watcher.dispose(); + } + this._fileWatchers.clear(); + + for (const entry of this._dirWatchers.values()) { + entry.watcher.dispose(); + } + this._dirWatchers.clear(); + } + create(id: number, uri: vscode.Uri, watchParentDirs: boolean, isRecursive: boolean, listeners: { create?: (uri: vscode.Uri) => void; change?: (uri: vscode.Uri) => void; delete?: (uri: vscode.Uri) => void }): void { + this.logger.trace(`Creating file watcher for ${uri.toString()}`); + const watcher = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(uri, isRecursive ? '**' : '*'), !listeners.create, !listeners.change, !listeners.delete); const parentDirWatchers: DirWatcherEntry[] = []; - this._fileWatchers.set(id, { watcher, dirWatchers: parentDirWatchers }); + this._fileWatchers.set(id, { uri, watcher, dirWatchers: parentDirWatchers }); if (listeners.create) { watcher.onDidCreate(listeners.create); } if (listeners.change) { watcher.onDidChange(listeners.change); } @@ -43,9 +64,10 @@ export class FileWatcherManager { let parentDirWatcher = this._dirWatchers.get(dirUri); if (!parentDirWatcher) { + this.logger.trace(`Creating parent dir watcher for ${dirUri.toString()}`); const glob = new vscode.RelativePattern(Utils.dirname(dirUri), Utils.basename(dirUri)); const parentWatcher = vscode.workspace.createFileSystemWatcher(glob, !listeners.create, true, !listeners.delete); - parentDirWatcher = { refCount: 0, watcher: parentWatcher }; + parentDirWatcher = { uri: dirUri, refCount: 0, watcher: parentWatcher }; this._dirWatchers.set(dirUri, parentDirWatcher); } parentDirWatcher.refCount++; @@ -75,15 +97,19 @@ export class FileWatcherManager { } } + delete(id: number): void { const entry = this._fileWatchers.get(id); if (entry) { + this.logger.trace(`Deleting file watcher for ${entry.uri}`); + for (const dirWatcher of entry.dirWatchers) { disposeAll(dirWatcher.listeners); const dirWatcherEntry = this._dirWatchers.get(dirWatcher.uri); if (dirWatcherEntry) { if (--dirWatcherEntry.refCount <= 0) { + this.logger.trace(`Deleting parent dir ${dirWatcherEntry.uri}`); dirWatcherEntry.watcher.dispose(); this._dirWatchers.delete(dirWatcher.uri); } diff --git a/extensions/typescript-language-features/src/tsServer/serverProcess.browser.ts b/extensions/typescript-language-features/src/tsServer/serverProcess.browser.ts index cd54bdca2fb..ab916a1f0e9 100644 --- a/extensions/typescript-language-features/src/tsServer/serverProcess.browser.ts +++ b/extensions/typescript-language-features/src/tsServer/serverProcess.browser.ts @@ -7,6 +7,7 @@ import { ServiceConnection } from '@vscode/sync-api-common/browser'; import { ApiService, Requests } from '@vscode/sync-api-service'; import * as vscode from 'vscode'; import { TypeScriptServiceConfiguration } from '../configuration/configuration'; +import { Logger } from '../logging/logger'; import { FileWatcherManager } from './fileWatchingManager'; import type * as Proto from './protocol/protocol'; import { TsServerLog, TsServerProcess, TsServerProcessFactory, TsServerProcessKind } from './server'; @@ -30,6 +31,7 @@ type BrowserWatchEvent = { export class WorkerServerProcessFactory implements TsServerProcessFactory { constructor( private readonly _extensionUri: vscode.Uri, + private readonly _logger: Logger, ) { } public fork( @@ -47,7 +49,7 @@ export class WorkerServerProcessFactory implements TsServerProcessFactory { // Explicitly give TS Server its path so it can // load local resources '--executingFilePath', tsServerPath, - ], tsServerLog); + ], tsServerLog, this._logger); } } @@ -60,16 +62,16 @@ class WorkerServerProcess implements TsServerProcess { private readonly _onDataHandlers = new Set<(data: Proto.Response) => void>(); private readonly _onErrorHandlers = new Set<(err: Error) => void>(); private readonly _onExitHandlers = new Set<(code: number | null, signal: string | null) => void>(); - private readonly watches = new FileWatcherManager(); - private readonly worker: Worker; + private readonly _worker: Worker; + private readonly _watches: FileWatcherManager; /** For communicating with TS server synchronously */ - private readonly tsserver: MessagePort; + private readonly _tsserver: MessagePort; /** For communicating watches asynchronously */ - private readonly watcher: MessagePort; + private readonly _watcher: MessagePort; /** For communicating with filesystem synchronously */ - private readonly syncFs: MessagePort; + private readonly _syncFs: MessagePort; public constructor( private readonly kind: TsServerProcessKind, @@ -77,17 +79,20 @@ class WorkerServerProcess implements TsServerProcess { extensionUri: vscode.Uri, args: readonly string[], private readonly tsServerLog: TsServerLog | undefined, + logger: Logger, ) { - this.worker = new Worker(tsServerPath, { name: `TS ${kind} server #${this.id}` }); + this._worker = new Worker(tsServerPath, { name: `TS ${kind} server #${this.id}` }); + + this._watches = new FileWatcherManager(logger); const tsserverChannel = new MessageChannel(); const watcherChannel = new MessageChannel(); const syncChannel = new MessageChannel(); - this.tsserver = tsserverChannel.port2; - this.watcher = watcherChannel.port2; - this.syncFs = syncChannel.port2; + this._tsserver = tsserverChannel.port2; + this._watcher = watcherChannel.port2; + this._syncFs = syncChannel.port2; - this.tsserver.onmessage = (event) => { + this._tsserver.onmessage = (event) => { if (event.data.type === 'log') { console.error(`unexpected log message on tsserver channel: ${JSON.stringify(event)}`); return; @@ -97,18 +102,18 @@ class WorkerServerProcess implements TsServerProcess { } }; - this.watcher.onmessage = (event: MessageEvent) => { + this._watcher.onmessage = (event: MessageEvent) => { switch (event.data.type) { case 'dispose': { - this.watches.delete(event.data.id); + this._watches.delete(event.data.id); break; } case 'watchDirectory': case 'watchFile': { - this.watches.create(event.data.id, vscode.Uri.from(event.data.uri), /*watchParentDirs*/ true, !!event.data.recursive, { - change: uri => this.watcher.postMessage({ type: 'watch', event: 'change', uri }), - create: uri => this.watcher.postMessage({ type: 'watch', event: 'create', uri }), - delete: uri => this.watcher.postMessage({ type: 'watch', event: 'delete', uri }), + this._watches.create(event.data.id, vscode.Uri.from(event.data.uri), /*watchParentDirs*/ true, !!event.data.recursive, { + change: uri => this._watcher.postMessage({ type: 'watch', event: 'change', uri }), + create: uri => this._watcher.postMessage({ type: 'watch', event: 'create', uri }), + delete: uri => this._watcher.postMessage({ type: 'watch', event: 'delete', uri }), }); break; } @@ -117,7 +122,7 @@ class WorkerServerProcess implements TsServerProcess { } }; - this.worker.onmessage = (msg: any) => { + this._worker.onmessage = (msg: any) => { // for logging only if (msg.data.type === 'log') { this.appendLog(msg.data.body); @@ -126,7 +131,7 @@ class WorkerServerProcess implements TsServerProcess { console.error(`unexpected message on main channel: ${JSON.stringify(msg)}`); }; - this.worker.onerror = (err: ErrorEvent) => { + this._worker.onerror = (err: ErrorEvent) => { console.error('error! ' + JSON.stringify(err)); for (const handler of this._onErrorHandlers) { // TODO: The ErrorEvent type might be wrong; previously this was typed as Error and didn't have the property access. @@ -134,7 +139,7 @@ class WorkerServerProcess implements TsServerProcess { } }; - this.worker.postMessage( + this._worker.postMessage( { args, extensionUri }, [syncChannel.port1, tsserverChannel.port1, watcherChannel.port1] ); @@ -145,7 +150,7 @@ class WorkerServerProcess implements TsServerProcess { } write(serverRequest: Proto.Request): void { - this.tsserver.postMessage(serverRequest); + this._tsserver.postMessage(serverRequest); } onData(handler: (response: Proto.Response) => void): void { @@ -162,10 +167,11 @@ class WorkerServerProcess implements TsServerProcess { } kill(): void { - this.worker.terminate(); - this.tsserver.close(); - this.watcher.close(); - this.syncFs.close(); + this._worker.terminate(); + this._tsserver.close(); + this._watcher.close(); + this._syncFs.close(); + this._watches.dispose(); } private appendLog(msg: string) { diff --git a/extensions/typescript-language-features/src/tsconfig.ts b/extensions/typescript-language-features/src/tsconfig.ts index ebbdd2a85cc..40a5a5c5982 100644 --- a/extensions/typescript-language-features/src/tsconfig.ts +++ b/extensions/typescript-language-features/src/tsconfig.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'path'; import * as vscode from 'vscode'; import type * as Proto from './tsServer/protocol/protocol'; import { ITypeScriptServiceClient, ServerResponse } from './typescriptService'; @@ -87,10 +86,10 @@ function inferredProjectConfigSnippet( export async function openOrCreateConfig( projectType: ProjectType, - rootPath: string, + rootPath: vscode.Uri, configuration: TypeScriptServiceConfiguration, ): Promise { - const configFile = vscode.Uri.file(path.join(rootPath, projectType === ProjectType.TypeScript ? 'tsconfig.json' : 'jsconfig.json')); + const configFile = vscode.Uri.joinPath(rootPath, projectType === ProjectType.TypeScript ? 'tsconfig.json' : 'jsconfig.json'); const col = vscode.window.activeTextEditor?.viewColumn; try { const doc = await vscode.workspace.openTextDocument(configFile); @@ -108,11 +107,11 @@ export async function openOrCreateConfig( export async function openProjectConfigOrPromptToCreate( projectType: ProjectType, client: ITypeScriptServiceClient, - rootPath: string, - configFileName: string, + rootPath: vscode.Uri, + configFilePath: string, ): Promise { - if (!isImplicitProjectConfigFile(configFileName)) { - const doc = await vscode.workspace.openTextDocument(configFileName); + if (!isImplicitProjectConfigFile(configFilePath)) { + const doc = await vscode.workspace.openTextDocument(client.toResource(configFilePath)); vscode.window.showTextDocument(doc, vscode.window.activeTextEditor?.viewColumn); return; } diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts index e562a8349c1..6eb30e20986 100644 --- a/extensions/typescript-language-features/src/typescriptService.ts +++ b/extensions/typescript-language-features/src/typescriptService.ts @@ -156,7 +156,7 @@ export interface ITypeScriptServiceClient { */ hasCapabilityForResource(resource: vscode.Uri, capability: ClientCapability): boolean; - getWorkspaceRootForResource(resource: vscode.Uri): string | undefined; + getWorkspaceRootForResource(resource: vscode.Uri): vscode.Uri | undefined; readonly onTsServerStarted: vscode.Event<{ version: TypeScriptVersion; usedApiVersion: API }>; readonly onProjectLanguageServiceStateChanged: vscode.Event; diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts index 31e86e6100f..86c6bb8d9f1 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -29,6 +29,7 @@ import { PluginManager, TypeScriptServerPlugin } from './tsServer/plugins'; import { TelemetryProperties, TelemetryReporter, VSCodeTelemetryReporter } from './logging/telemetry'; import Tracer from './logging/tracer'; import { ProjectType, inferredProjectCompilerOptions } from './tsconfig'; +import { Schemes } from './configuration/schemes'; export interface TsDiagnostics { @@ -91,10 +92,12 @@ namespace ServerState { export type State = typeof None | Running | Errored; } +export const emptyAuthority = 'ts-nul-authority'; + +export const inMemoryResourcePrefix = '^'; + export default class TypeScriptServiceClient extends Disposable implements ITypeScriptServiceClient { - private readonly emptyAuthority = 'ts-nul-authority'; - private readonly inMemoryResourcePrefix = '^'; private readonly _onReady?: { promise: Promise; resolve: () => void; reject: () => void }; private _configuration: TypeScriptServiceConfiguration; @@ -258,7 +261,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType readonly onDidChangeCapabilities = this._onDidChangeCapabilities.event; private isProjectWideIntellisenseOnWebEnabled(): boolean { - return isWebAndHasSharedArrayBuffers() && this._configuration.enableProjectWideIntellisenseOnWeb; + return isWebAndHasSharedArrayBuffers() && this._configuration.webProjectWideIntellisenseEnabled; } private cancelInflightRequestsForResource(resource: vscode.Uri): void { @@ -695,9 +698,9 @@ export default class TypeScriptServiceClient extends Disposable implements IType return resource.fsPath; } - return (this.isProjectWideIntellisenseOnWebEnabled() ? '' : this.inMemoryResourcePrefix) + return (this.isProjectWideIntellisenseOnWebEnabled() ? '' : inMemoryResourcePrefix) + '/' + resource.scheme - + '/' + (resource.authority || this.emptyAuthority) + + '/' + (resource.authority || emptyAuthority) + (resource.path.startsWith('/') ? resource.path : '/' + resource.path) + (resource.fragment ? '#' + resource.fragment : ''); } @@ -719,15 +722,13 @@ export default class TypeScriptServiceClient extends Disposable implements IType } switch (capability) { - case ClientCapability.Semantic: - { - return fileSchemes.semanticSupportedSchemes.includes(resource.scheme); - } + case ClientCapability.Semantic: { + return fileSchemes.getSemanticSupportedSchemes().includes(resource.scheme); + } case ClientCapability.Syntax: - case ClientCapability.EnhancedSyntax: - { - return true; - } + case ClientCapability.EnhancedSyntax: { + return true; + } } } @@ -741,46 +742,48 @@ export default class TypeScriptServiceClient extends Disposable implements IType } const parts = filepath.match(/^\/([^\/]+)\/([^\/]*)\/(.+)$/); if (parts) { - const resource = vscode.Uri.parse(parts[1] + '://' + (parts[2] === this.emptyAuthority ? '' : parts[2]) + '/' + parts[3]); + const resource = vscode.Uri.parse(parts[1] + '://' + (parts[2] === emptyAuthority ? '' : parts[2]) + '/' + parts[3]); return this.bufferSyncSupport.toVsCodeResource(resource); } } - if (filepath.startsWith(this.inMemoryResourcePrefix)) { + if (filepath.startsWith(inMemoryResourcePrefix)) { const parts = filepath.match(/^\^\/([^\/]+)\/([^\/]*)\/(.+)$/); if (parts) { - const resource = vscode.Uri.parse(parts[1] + '://' + (parts[2] === this.emptyAuthority ? '' : parts[2]) + '/' + parts[3]); + const resource = vscode.Uri.parse(parts[1] + '://' + (parts[2] === emptyAuthority ? '' : parts[2]) + '/' + parts[3]); return this.bufferSyncSupport.toVsCodeResource(resource); } } return this.bufferSyncSupport.toResource(filepath); } - public getWorkspaceRootForResource(resource: vscode.Uri): string | undefined { + public getWorkspaceRootForResource(resource: vscode.Uri): vscode.Uri | undefined { const roots = vscode.workspace.workspaceFolders ? Array.from(vscode.workspace.workspaceFolders) : undefined; if (!roots?.length) { - if (resource.scheme === fileSchemes.officeScript) { - return '/'; - } return undefined; } - let tsRootPath: string | undefined; - for (const root of roots.sort((a, b) => a.uri.fsPath.length - b.uri.fsPath.length)) { - if (root.uri.scheme === resource.scheme && root.uri.authority === resource.authority) { - if (resource.fsPath.startsWith(root.uri.fsPath + path.sep)) { - tsRootPath = this.toTsFilePath(root.uri); - break; + // For notebook cells, we need to use the notebook document to look up the workspace + if (resource.scheme === Schemes.notebookCell) { + for (const notebook of vscode.workspace.notebookDocuments) { + for (const cell of notebook.getCells()) { + if (cell.document.uri.toString() === resource.toString()) { + resource = notebook.uri; + break; + } } } } - tsRootPath ??= this.toTsFilePath(roots[0].uri); - if (!tsRootPath || tsRootPath.startsWith(this.inMemoryResourcePrefix)) { - return undefined; + for (const root of roots.sort((a, b) => a.uri.fsPath.length - b.uri.fsPath.length)) { + if (root.uri.scheme === resource.scheme && root.uri.authority === resource.authority) { + if (resource.fsPath.startsWith(root.uri.fsPath + path.sep)) { + return root.uri; + } + } } - return tsRootPath; + return vscode.workspace.getWorkspaceFolder(resource)?.uri; } public execute(command: keyof TypeScriptRequests, args: any, token: vscode.CancellationToken, config?: ExecConfig): Promise> { @@ -902,7 +905,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType const diagnosticEvent = event as Proto.DiagnosticEvent; if (diagnosticEvent.body?.diagnostics) { this._onDiagnosticsReceived.fire({ - kind: getDignosticsKind(event), + kind: getDiagnosticsKind(event), resource: this.toResource(diagnosticEvent.body.file), diagnostics: diagnosticEvent.body.diagnostics }); @@ -1089,7 +1092,7 @@ ${error.serverStack} }; } -function getDignosticsKind(event: Proto.Event) { +function getDiagnosticsKind(event: Proto.Event) { switch (event.event) { case 'syntaxDiag': return DiagnosticKind.Syntax; case 'semanticDiag': return DiagnosticKind.Semantic; diff --git a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts index 61aff6cda2f..367ee86b58b 100644 --- a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts +++ b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts @@ -62,9 +62,9 @@ export class IntellisenseStatus extends Disposable { commandManager.register({ id: this.openOpenConfigCommandId, - execute: async (rootPath: string, projectType: ProjectType) => { + execute: async (root: vscode.Uri, projectType: ProjectType) => { if (this._state.type === IntellisenseState.Type.Resolved) { - await openProjectConfigOrPromptToCreate(projectType, this._client, rootPath, this._state.configFile); + await openProjectConfigOrPromptToCreate(projectType, this._client, root, this._state.configFile); } else if (this._state.type === IntellisenseState.Type.Pending) { await openProjectConfigForFile(projectType, this._client, this._state.resource); } @@ -72,8 +72,8 @@ export class IntellisenseStatus extends Disposable { }); commandManager.register({ id: this.createOrOpenConfigCommandId, - execute: async (rootPath: string, projectType: ProjectType) => { - await openOrCreateConfig(projectType, rootPath, this._client.configuration); + execute: async (root: vscode.Uri, projectType: ProjectType) => { + await openOrCreateConfig(projectType, root, this._client.configuration); }, }); diff --git a/extensions/typescript-language-features/src/utils/fs.ts b/extensions/typescript-language-features/src/utils/fs.ts index 88ce3e3aa75..a742b9604f8 100644 --- a/extensions/typescript-language-features/src/utils/fs.ts +++ b/extensions/typescript-language-features/src/utils/fs.ts @@ -5,7 +5,7 @@ import * as vscode from 'vscode'; -export const exists = async (resource: vscode.Uri): Promise => { +export async function exists(resource: vscode.Uri): Promise { try { const stat = await vscode.workspace.fs.stat(resource); // stat.type is an enum flag @@ -13,4 +13,8 @@ export const exists = async (resource: vscode.Uri): Promise => { } catch { return false; } -}; +} + +export function looksLikeAbsoluteWindowsPath(path: string): boolean { + return /^[a-zA-Z]:[\/\\]/.test(path); +} diff --git a/extensions/typescript-language-features/src/utils/resourceMap.ts b/extensions/typescript-language-features/src/utils/resourceMap.ts index a024a761da3..2328156445b 100644 --- a/extensions/typescript-language-features/src/utils/resourceMap.ts +++ b/extensions/typescript-language-features/src/utils/resourceMap.ts @@ -5,6 +5,7 @@ import * as vscode from 'vscode'; import * as fileSchemes from '../configuration/fileSchemes'; +import { looksLikeAbsoluteWindowsPath } from './fs'; /** * Maps of file resources @@ -72,11 +73,11 @@ export class ResourceMap { this._map.clear(); } - public get values(): Iterable { + public values(): Iterable { return Array.from(this._map.values(), x => x.value); } - public get entries(): Iterable<{ resource: vscode.Uri; value: T }> { + public entries(): Iterable<{ resource: vscode.Uri; value: T }> { return this._map.values(); } @@ -89,13 +90,9 @@ export class ResourceMap { } private isCaseInsensitivePath(path: string) { - if (isWindowsPath(path)) { + if (looksLikeAbsoluteWindowsPath(path)) { return true; } return path[0] === '/' && this.config.onCaseInsensitiveFileSystem; } } - -function isWindowsPath(path: string): boolean { - return /^[a-zA-Z]:[\/\\]/.test(path); -} diff --git a/extensions/typescript-language-features/web/webServer.ts b/extensions/typescript-language-features/web/webServer.ts index 1db00fe2a9d..1688a93fcc0 100644 --- a/extensions/typescript-language-features/web/webServer.ts +++ b/extensions/typescript-language-features/web/webServer.ts @@ -46,23 +46,42 @@ function fromResource(extensionUri: URI, uri: URI) { } return `/${uri.scheme}/${uri.authority}${uri.path}`; } + function updateWatch(event: 'create' | 'change' | 'delete', uri: URI, extensionUri: URI) { - const kind = event === 'create' ? ts.FileWatcherEventKind.Created - : event === 'change' ? ts.FileWatcherEventKind.Changed - : event === 'delete' ? ts.FileWatcherEventKind.Deleted - : ts.FileWatcherEventKind.Changed; + const kind = toTsWatcherKind(event); const path = fromResource(extensionUri, uri); - if (watchFiles.has(path)) { - watchFiles.get(path)!.callback(path, kind); + + const fileWatcher = watchFiles.get(path); + if (fileWatcher) { + fileWatcher.callback(path, kind); return; } - let found = false; + for (const watch of Array.from(watchDirectories.keys()).filter(dir => path.startsWith(dir))) { watchDirectories.get(watch)!.callback(path); - found = true; + return; } - if (!found) { - console.error(`no watcher found for ${path}`); + + console.error(`no watcher found for ${path}`); +} + +function toTsWatcherKind(event: 'create' | 'change' | 'delete') { + if (event === 'create') { + return ts.FileWatcherEventKind.Created; + } else if (event === 'change') { + return ts.FileWatcherEventKind.Changed; + } else if (event === 'delete') { + return ts.FileWatcherEventKind.Deleted; + } + throw new Error(`Unknown event: ${event}`); +} + +class AccessOutsideOfRootError extends Error { + constructor( + public readonly filepath: string, + public readonly projectRootPaths: readonly string[] + ) { + super(`Could not read file outside of project root ${filepath}`); } } @@ -95,17 +114,26 @@ function createServerHost(extensionUri: URI, logger: ts.server.Logger, apiClient const logNormal = log.bind(null, ts.server.LogLevel.normal); const logVerbose = log.bind(null, ts.server.LogLevel.verbose); + const noopWatcher: ts.FileWatcher = { close() { } }; return { watchFile(path: string, callback: ts.FileWatcherCallback, pollingInterval?: number, options?: ts.WatchOptions): ts.FileWatcher { if (looksLikeLibDtsPath(path)) { // We don't support watching lib files on web since they are readonly - return { close() { } }; + return noopWatcher; } logVerbose('fs.watchFile', { path }); + let uri: URI; + try { + uri = toResource(path); + } catch (e) { + console.error(e); + return noopWatcher; + } + watchFiles.set(path, { path, callback, pollingInterval, options }); watchId++; - fsWatcher.postMessage({ type: 'watchFile', uri: toResource(path), id: watchId }); + fsWatcher.postMessage({ type: 'watchFile', uri, id: watchId }); return { close() { logVerbose('fs.watchFile.close', { path }); @@ -118,9 +146,17 @@ function createServerHost(extensionUri: URI, logger: ts.server.Logger, apiClient watchDirectory(path: string, callback: ts.DirectoryWatcherCallback, recursive?: boolean, options?: ts.WatchOptions): ts.FileWatcher { logVerbose('fs.watchDirectory', { path }); + let uri: URI; + try { + uri = toResource(path); + } catch (e) { + console.error(e); + return noopWatcher; + } + watchDirectories.set(path, { path, callback, recursive, options }); watchId++; - fsWatcher.postMessage({ type: 'watchDirectory', recursive, uri: toResource(path), id: watchId }); + fsWatcher.postMessage({ type: 'watchDirectory', recursive, uri, id: watchId }); return { close() { logVerbose('fs.watchDirectory.close', { path }); @@ -289,9 +325,13 @@ function createServerHost(extensionUri: URI, logger: ts.server.Logger, apiClient return currentDirectory; }, getDirectories(path: string): string[] { + logVerbose('fs.getDirectories', { path }); + return getAccessibleFileSystemEntries(path).directories.slice(); }, readDirectory(path: string, extensions?: readonly string[], excludes?: readonly string[], includes?: readonly string[], depth?: number): string[] { + logVerbose('fs.readDirectory', { path }); + return matchFiles(path, extensions, excludes, includes, /*useCaseSensitiveFileNames*/ true, currentDirectory, depth, getAccessibleFileSystemEntries, realpath); }, getModifiedTime(path: string): Date | undefined { @@ -424,7 +464,7 @@ function createServerHost(extensionUri: URI, logger: ts.server.Logger, apiClient } if (allowRead === 'block') { - throw new Error(`Could not read file outside of project root ${filepath}`); + throw new AccessOutsideOfRootError(filepath, Array.from(projectRootPaths.keys())); } return uri; diff --git a/extensions/typescript-language-features/yarn.lock b/extensions/typescript-language-features/yarn.lock index a86d12d0e3f..2b8e967e6cb 100644 --- a/extensions/typescript-language-features/yarn.lock +++ b/extensions/typescript-language-features/yarn.lock @@ -348,6 +348,13 @@ jsonc-parser@^3.2.0: resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w== +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + mime-db@1.52.0: version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" @@ -365,15 +372,17 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -semver@5.5.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477" - integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw== +semver@7.5.2: + version "7.5.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb" + integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ== + dependencies: + lru-cache "^6.0.0" semver@^5.3.0, semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== shimmer@^1.1.0, shimmer@^1.2.0: version "1.2.1" @@ -413,3 +422,8 @@ vscode-uri@3.0.3, vscode-uri@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84" integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== diff --git a/extensions/vb/language-configuration.json b/extensions/vb/language-configuration.json index a31b67bec0f..53f537617c5 100644 --- a/extensions/vb/language-configuration.json +++ b/extensions/vb/language-configuration.json @@ -5,8 +5,7 @@ "brackets": [ ["{", "}"], ["[", "]"], - ["(", ")"], - ["<", ">"] + ["(", ")"] ], "autoClosingPairs": [ ["{", "}"], diff --git a/extensions/vb/package.json b/extensions/vb/package.json index 801ef7180da..6e5dd080c0b 100644 --- a/extensions/vb/package.json +++ b/extensions/vb/package.json @@ -9,7 +9,7 @@ "vscode": "*" }, "scripts": { - "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/asp.vb.net.tmbundle Syntaxes/ASP%20VB.net.plist ./syntaxes/asp-vb-net.tmlanguage.json" + "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/asp.vb.net.tmbundle Syntaxes/ASP%%20VB.net.plist ./syntaxes/asp-vb-net.tmlanguage.json" }, "contributes": { "languages": [ diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json index fb79a5a2c53..b3e681dc25b 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -7,6 +7,7 @@ "enabledApiProposals": [ "authSession", "contribViewsRemote", + "contribStatusBarItems", "customEditorMove", "diffCommand", "documentFiltersExclusive", @@ -25,6 +26,7 @@ "notebookMime", "portsAttributes", "quickPickSortByLabel", + "readonlyMessage", "resolvers", "saveEditor", "scmActionButton", @@ -42,10 +44,14 @@ "timeline", "tokenInformation", "treeItemCheckbox", + "treeViewActiveItem", "treeViewReveal", "workspaceTrust", "telemetry", - "windowActivity" + "windowActivity", + "interactiveUserActions", + "envCollectionWorkspace", + "envCollectionOptions" ], "private": true, "activationEvents": [], @@ -188,7 +194,19 @@ } ] } - ] + ], + "statusBarItems": { + "id": "myStaticItem", + "alignment": "right", + "priority": 17, + "name": "My Static Item", + "text": "Hello $(globe)", + "tooltip": "Hover World", + "accessibilityInformation": { + "label": "Hello World", + "role": "button" + } + } }, "scripts": { "compile": "node ./node_modules/vscode/bin/compile -watch -p ./", diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/debug.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/debug.test.ts index 189bb8e3747..84226f62988 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/debug.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/debug.test.ts @@ -6,12 +6,22 @@ import * as assert from 'assert'; import { basename } from 'path'; import { commands, debug, Disposable, window, workspace } from 'vscode'; -import { assertNoRpc, disposeAll } from '../utils'; +import { assertNoRpc, createRandomFile, disposeAll } from '../utils'; suite('vscode API - debug', function () { teardown(assertNoRpc); + test('breakpoints are available before accessing debug extension API', async () => { + const file = await createRandomFile(undefined, undefined, '.js'); + const doc = await workspace.openTextDocument(file); + await window.showTextDocument(doc); + await commands.executeCommand('editor.debug.action.toggleBreakpoint'); + + assert.strictEqual(debug.breakpoints.length, 1); + await commands.executeCommand('editor.debug.action.toggleBreakpoint'); + }); + test('breakpoints', async function () { assert.strictEqual(debug.breakpoints.length, 0); let onDidChangeBreakpointsCounter = 0; diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/documentPaste.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/documentPaste.test.ts index 9ea13d1ff5e..dd5b9eae41c 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/documentPaste.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/documentPaste.test.ts @@ -9,7 +9,8 @@ import { closeAllEditors, createRandomFile, disposeAll } from '../utils'; const textPlain = 'text/plain'; -(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('vscode API - Copy Paste', function () { +// Skipped due to flakiness on Linux Desktop and errors on web +suite.skip('vscode API - Copy Paste', function () { this.retries(3); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/readonlyFileSystem.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/readonlyFileSystem.test.ts new file mode 100644 index 00000000000..745eba859fb --- /dev/null +++ b/extensions/vscode-api-tests/src/singlefolder-tests/readonlyFileSystem.test.ts @@ -0,0 +1,63 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as assert from 'assert'; +import * as vscode from 'vscode'; +import { TestFS } from '../memfs'; +import { assertNoRpc, closeAllEditors } from '../utils'; + +suite('vscode API - file system', () => { + + teardown(async function () { + assertNoRpc(); + await closeAllEditors(); + }); + + test('readonly file system - boolean', async function () { + const fs = new TestFS('this-fs', false); + const reg = vscode.workspace.registerFileSystemProvider(fs.scheme, fs, { isReadonly: true }); + let error: any | undefined; + try { + await vscode.workspace.fs.writeFile(vscode.Uri.parse('this-fs:/foo.txt'), Buffer.from('Hello World')); + } catch (e) { + error = e; + } + assert.strictEqual(vscode.workspace.fs.isWritableFileSystem('this-fs'), false); + assert.strictEqual(error instanceof vscode.FileSystemError, true); + const fileError: vscode.FileSystemError = error; + assert.strictEqual(fileError.code, 'NoPermissions'); + reg.dispose(); + }); + + test('readonly file system - markdown', async function () { + const fs = new TestFS('this-fs', false); + const reg = vscode.workspace.registerFileSystemProvider(fs.scheme, fs, { isReadonly: new vscode.MarkdownString('This file is readonly.') }); + let error: any | undefined; + try { + await vscode.workspace.fs.writeFile(vscode.Uri.parse('this-fs:/foo.txt'), Buffer.from('Hello World')); + } catch (e) { + error = e; + } + assert.strictEqual(vscode.workspace.fs.isWritableFileSystem('this-fs'), false); + assert.strictEqual(error instanceof vscode.FileSystemError, true); + const fileError: vscode.FileSystemError = error; + assert.strictEqual(fileError.code, 'NoPermissions'); + reg.dispose(); + }); + + test('writeable file system', async function () { + const fs = new TestFS('this-fs', false); + const reg = vscode.workspace.registerFileSystemProvider(fs.scheme, fs); + let error: any | undefined; + try { + await vscode.workspace.fs.writeFile(vscode.Uri.parse('this-fs:/foo.txt'), Buffer.from('Hello World')); + } catch (e) { + error = e; + } + assert.strictEqual(vscode.workspace.fs.isWritableFileSystem('this-fs'), true); + assert.strictEqual(error, undefined); + reg.dispose(); + }); +}); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts index 36c1e66c852..f8c8b806853 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { deepStrictEqual, doesNotThrow, equal, strictEqual, throws } from 'assert'; -import { ConfigurationTarget, Disposable, env, EnvironmentVariableMutator, EnvironmentVariableMutatorType, EventEmitter, ExtensionContext, extensions, ExtensionTerminalOptions, Pseudoterminal, Terminal, TerminalDimensions, TerminalExitReason, TerminalOptions, TerminalState, UIKind, window, workspace } from 'vscode'; +import { deepStrictEqual, doesNotThrow, equal, ok, strictEqual, throws } from 'assert'; +import { commands, ConfigurationTarget, Disposable, env, EnvironmentVariableCollection, EnvironmentVariableMutator, EnvironmentVariableMutatorOptions, EnvironmentVariableMutatorType, EnvironmentVariableScope, EventEmitter, ExtensionContext, extensions, ExtensionTerminalOptions, Pseudoterminal, Terminal, TerminalDimensions, TerminalExitReason, TerminalOptions, TerminalState, UIKind, Uri, window, workspace } from 'vscode'; import { assertNoRpc, poll } from '../utils'; // Disable terminal tests: @@ -347,8 +347,52 @@ import { assertNoRpc, poll } from '../utils'; }); }); + suite('selection', () => { + test('should be undefined immediately after creation', async () => { + const terminal = window.createTerminal({ name: 'selection test' }); + terminal.show(); + equal(terminal.selection, undefined); + terminal.dispose(); + }); + test('should be defined after selecting all content', async () => { + const terminal = window.createTerminal({ name: 'selection test' }); + terminal.show(); + // Wait for some terminal data + await new Promise(r => { + const disposable = window.onDidWriteTerminalData(() => { + disposable.dispose(); + r(); + }); + }); + await commands.executeCommand('workbench.action.terminal.selectAll'); + await poll(() => Promise.resolve(), () => terminal.selection !== undefined, 'selection should be defined'); + terminal.dispose(); + }); + test('should be undefined after clearing a selection', async () => { + const terminal = window.createTerminal({ name: 'selection test' }); + terminal.show(); + // Wait for some terminal data + await new Promise(r => { + const disposable = window.onDidWriteTerminalData(() => { + disposable.dispose(); + r(); + }); + }); + await commands.executeCommand('workbench.action.terminal.selectAll'); + await poll(() => Promise.resolve(), () => terminal.selection !== undefined, 'selection should be defined'); + await commands.executeCommand('workbench.action.terminal.clearSelection'); + await poll(() => Promise.resolve(), () => terminal.selection === undefined, 'selection should not be defined'); + terminal.dispose(); + }); + }); + suite('window.onDidWriteTerminalData', () => { - test('should listen to all future terminal data events', (done) => { + test('should listen to all future terminal data events', function (done) { + // This test has been flaky in the past but it's not clear why, possibly because + // events from previous tests polluting the event recording in this test. Retries + // was added so we continue to have coverage of the onDidWriteTerminalData API. + this.retries(3); + const openEvents: string[] = []; const dataEvents: { name: string; data: string }[] = []; const closeEvents: string[] = []; @@ -368,11 +412,12 @@ import { assertNoRpc, poll } from '../utils'; try { if (closeEvents.length === 1) { deepStrictEqual(openEvents, ['test1']); - deepStrictEqual(dataEvents, [{ name: 'test1', data: 'write1' }]); + ok(dataEvents.some(e => e.name === 'test1' && e.data === 'write1')); deepStrictEqual(closeEvents, ['test1']); } else if (closeEvents.length === 2) { deepStrictEqual(openEvents, ['test1', 'test2']); - deepStrictEqual(dataEvents, [{ name: 'test1', data: 'write1' }, { name: 'test2', data: 'write2' }]); + ok(dataEvents.some(e => e.name === 'test1' && e.data === 'write1')); + ok(dataEvents.some(e => e.name === 'test2' && e.data === 'write2')); deepStrictEqual(closeEvents, ['test1', 'test2']); } resolveOnceClosed!(); @@ -848,21 +893,56 @@ import { assertNoRpc, poll } from '../utils'; collection.replace('A', '~a2~'); collection.append('B', '~b2~'); collection.prepend('C', '~c2~'); - // Verify get - deepStrictEqual(collection.get('A'), { value: '~a2~', type: EnvironmentVariableMutatorType.Replace, scope: undefined }); - deepStrictEqual(collection.get('B'), { value: '~b2~', type: EnvironmentVariableMutatorType.Append, scope: undefined }); - deepStrictEqual(collection.get('C'), { value: '~c2~', type: EnvironmentVariableMutatorType.Prepend, scope: undefined }); - + const defaultOptions: Required = { + applyAtProcessCreation: true, + applyAtShellIntegration: false + }; + deepStrictEqual(collection.get('A'), { value: '~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions }); + deepStrictEqual(collection.get('B'), { value: '~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions }); + deepStrictEqual(collection.get('C'), { value: '~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions }); // Verify forEach const entries: [string, EnvironmentVariableMutator][] = []; collection.forEach((v, m) => entries.push([v, m])); deepStrictEqual(entries, [ - ['A', { value: '~a2~', type: EnvironmentVariableMutatorType.Replace, scope: undefined }], - ['B', { value: '~b2~', type: EnvironmentVariableMutatorType.Append, scope: undefined }], - ['C', { value: '~c2~', type: EnvironmentVariableMutatorType.Prepend, scope: undefined }] + ['A', { value: '~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions }], + ['B', { value: '~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions }], + ['C', { value: '~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions }] ]); }); + + test('get and forEach should work (scope)', () => { + // TODO: Remove cast once `envCollectionWorkspace` API is finalized. + const collection = extensionContext.environmentVariableCollection as (EnvironmentVariableCollection & { getScopedEnvironmentVariableCollection(scope: EnvironmentVariableScope): EnvironmentVariableCollection }); + disposables.push({ dispose: () => collection.clear() }); + const scope = { workspaceFolder: { uri: Uri.file('workspace1'), name: 'workspace1', index: 0 } }; + const scopedCollection = collection.getScopedEnvironmentVariableCollection(scope); + scopedCollection.replace('A', 'scoped~a2~'); + scopedCollection.append('B', 'scoped~b2~'); + scopedCollection.prepend('C', 'scoped~c2~'); + collection.replace('A', '~a2~'); + collection.append('B', '~b2~'); + collection.prepend('C', '~c2~'); + // Verify get for scope + const defaultOptions: Required = { + applyAtProcessCreation: true, + applyAtShellIntegration: false + }; + const expectedScopedCollection = collection.getScopedEnvironmentVariableCollection(scope); + deepStrictEqual(expectedScopedCollection.get('A'), { value: 'scoped~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions }); + deepStrictEqual(expectedScopedCollection.get('B'), { value: 'scoped~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions }); + deepStrictEqual(expectedScopedCollection.get('C'), { value: 'scoped~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions }); + + // Verify forEach + const entries: [string, EnvironmentVariableMutator][] = []; + expectedScopedCollection.forEach((v, m) => entries.push([v, m])); + deepStrictEqual(entries.map(v => v[1]), [ + { value: 'scoped~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions }, + { value: 'scoped~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions }, + { value: 'scoped~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions } + ]); + deepStrictEqual(entries.map(v => v[0]), ['A', 'B', 'C']); + }); }); }); }); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts index 2e116ac844b..2a9fe97c144 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts @@ -1036,4 +1036,28 @@ suite('vscode API - window', () => { statusBarEntryWithId.name = 'Test Name'; assert.strictEqual(statusBarEntryWithId.name, 'Test Name'); }); + + test('createStatusBar - static', async function () { + + const item = window.createStatusBarItem('myStaticItem'); + + assert.strictEqual(item.alignment, StatusBarAlignment.Right); + assert.strictEqual(item.priority, 17); + assert.strictEqual(item.name, 'My Static Item'); + assert.strictEqual(item.text, 'Hello $(globe)'); + assert.strictEqual(item.tooltip, 'Hover World'); + assert.deepStrictEqual(item.accessibilityInformation, { label: 'Hello World', role: 'button' }); + + item.dispose(); + }); + + test('createStatusBar - static, CANNOT change some props', async function () { + + const item = window.createStatusBarItem('myStaticItem', StatusBarAlignment.Left, 12); + + assert.strictEqual(item.alignment, StatusBarAlignment.Right); + assert.strictEqual(item.priority, 17); + + item.dispose(); + }); }); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.fs.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.fs.test.ts index ff632e956eb..ad79f159bfc 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.fs.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.fs.test.ts @@ -187,7 +187,6 @@ suite('vscode API - workspace-fs', () => { test('vscode.workspace.fs error reporting is weird #132981', async function () { - const uri = await createRandomFile(); const source = vscode.Uri.joinPath(uri, `./${Math.random().toString(16).slice(2, 8)}`); @@ -217,4 +216,48 @@ suite('vscode API - workspace-fs', () => { assert.strictEqual(err.code, 'FileNotFound'); } }); + + test('fs.createFolder creates recursively', async function () { + + const folder = root.with({ path: posix.join(root.path, 'deeply', 'nested', 'folder') }); + await vscode.workspace.fs.createDirectory(folder); + + let stat = await vscode.workspace.fs.stat(folder); + assert.strictEqual(stat.type, vscode.FileType.Directory); + + await vscode.workspace.fs.delete(folder, { recursive: true, useTrash: false }); + + await vscode.workspace.fs.createDirectory(folder); // calling on existing folder is also ok! + + const file = root.with({ path: posix.join(folder.path, 'file.txt') }); + await vscode.workspace.fs.writeFile(file, Buffer.from('Hello World')); + const folder2 = root.with({ path: posix.join(file.path, 'invalid') }); + let e; + try { + await vscode.workspace.fs.createDirectory(folder2); // cannot create folder on file path + } catch (error) { + e = error; + } + assert.ok(e); + + const folder3 = root.with({ path: posix.join(root.path, 'DEEPLY', 'NESTED', 'FOLDER') }); + await vscode.workspace.fs.createDirectory(folder3); // calling on different cased folder is ok! + stat = await vscode.workspace.fs.stat(folder3); + assert.strictEqual(stat.type, vscode.FileType.Directory); + + await vscode.workspace.fs.delete(folder, { recursive: true, useTrash: false }); + }); + + test('fs.writeFile creates parents recursively', async function () { + + const folder = root.with({ path: posix.join(root.path, 'other-deeply', 'nested', 'folder') }); + const file = root.with({ path: posix.join(folder.path, 'file.txt') }); + + await vscode.workspace.fs.writeFile(file, Buffer.from('Hello World')); + + const stat = await vscode.workspace.fs.stat(file); + assert.strictEqual(stat.type, vscode.FileType.File); + + await vscode.workspace.fs.delete(folder, { recursive: true, useTrash: false }); + }); }); diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/test.code-snippets b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.code-snippets new file mode 100644 index 00000000000..fb3df23dd42 --- /dev/null +++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.code-snippets @@ -0,0 +1,40 @@ +{ + // Each snippet is defined under a snippet name and has a scope, prefix, body and + // description. The scope defines in watch languages the snippet is applicable. The prefix is what is + // used to trigger the snippet and the body will be expanded and inserted.Possible variables are: + // $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. + // Placeholders with the same ids are connected. + // Example: + "MSFT Copyright Header": { + "scope": "javascript,typescript,css", + "prefix": [ + "header", + "stub", + "copyright" + ], + "body": [ + "/*---------------------------------------------------------------------------------------------", + " * Copyright (c) Microsoft Corporation. All rights reserved.", + " * Licensed under the MIT License. See License.txt in the project root for license information.", + " *--------------------------------------------------------------------------------------------*/", + "", + "$0" + ], + "description": "Insert Copyright Statement" + }, + "TS -> Inject Service": { + "scope": "typescript", + "description": "Constructor Injection Pattern", + "prefix": "@inject", + "body": "@$1 private readonly _$2: ${1},$0" + }, + "TS -> Event & Emitter": { + "scope": "typescript", + "prefix": "emitter", + "description": "Add emitter and event properties", + "body": [ + "private readonly _onDid$1 = new Emitter<$2>();", + "readonly onDid$1: Event<$2> = this._onDid$1.event;" + ], + } +} 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 9995b89e0ce..2b8a1e05fc7 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -120,9 +120,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -162,9 +162,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -190,9 +190,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -232,9 +232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -246,9 +246,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -400,9 +400,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -428,9 +428,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -456,9 +456,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -470,9 +470,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -484,9 +484,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/13448_html.json b/extensions/vscode-colorize-tests/test/colorize-results/13448_html.json index ebe403925c7..659360a9f42 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/13448_html.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/13448_html.json @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ 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 69544dc9875..befc3ca8321 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json @@ -8,9 +8,9 @@ "dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D", "light_vs": "source.css.less entity.other.attribute-name.id: #800000", "hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D", - "dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D", + "dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D", "hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85", - "light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000" + "light_modern": "source.css.less entity.other.attribute-name.id: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D", "light_vs": "source.css.less entity.other.attribute-name.id: #800000", "hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D", - "dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D", + "dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D", "hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85", - "light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000" + "light_modern": "source.css.less entity.other.attribute-name.id: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -120,9 +120,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -260,9 +260,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ 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 d3139a2ec60..0c325bffb21 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -148,9 +148,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -162,9 +162,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -274,9 +274,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -288,9 +288,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -302,9 +302,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -456,9 +456,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -470,9 +470,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -568,9 +568,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -596,9 +596,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -624,9 +624,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -652,9 +652,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -736,9 +736,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -750,9 +750,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -778,9 +778,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -806,9 +806,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -820,9 +820,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -834,9 +834,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -848,9 +848,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -890,9 +890,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -918,9 +918,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -932,9 +932,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -946,9 +946,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -960,9 +960,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -974,9 +974,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -988,9 +988,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json b/extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json index 315744dc177..c8ca0791cb3 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "markup.deleted: #CE9178", "light_vs": "markup.deleted: #A31515", "hc_black": "markup.deleted: #CE9178", - "dark_plus_experimental": "markup.deleted: #CE9178", + "dark_modern": "markup.deleted: #CE9178", "hc_light": "markup.deleted: #5A5A5A", - "light_plus_experimental": "markup.deleted: #A31515" + "light_modern": "markup.deleted: #A31515" } }, { @@ -148,9 +148,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "markup.changed: #569CD6", "light_vs": "markup.changed: #0451A5", "hc_black": "markup.changed: #569CD6", - "dark_plus_experimental": "markup.changed: #569CD6", + "dark_modern": "markup.changed: #569CD6", "hc_light": "markup.changed: #0451A5", - "light_plus_experimental": "markup.changed: #0451A5" + "light_modern": "markup.changed: #0451A5" } }, { @@ -176,9 +176,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "markup.inserted: #B5CEA8", "light_vs": "markup.inserted: #098658", "hc_black": "markup.inserted: #B5CEA8", - "dark_plus_experimental": "markup.inserted: #B5CEA8", + "dark_modern": "markup.inserted: #B5CEA8", "hc_light": "markup.inserted: #096D48", - "light_plus_experimental": "markup.inserted: #098658" + "light_modern": "markup.inserted: #098658" } }, { @@ -204,9 +204,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json b/extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json index 7d866d2d6b6..3a43a8a39fb 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json @@ -8,9 +8,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json b/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json index 1b0318071eb..71a5a901280 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json @@ -8,9 +8,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "storage.modifier.package.java: #D4D4D4", "light_vs": "storage.modifier.package.java: #000000", "hc_black": "storage.modifier.package.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.package.java: #D4D4D4", + "dark_modern": "storage.modifier.package.java: #D4D4D4", "hc_light": "storage.modifier.package.java: #000000", - "light_plus_experimental": "storage.modifier.package.java: #000000" + "light_modern": "storage.modifier.package.java: #000000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "storage.modifier.import.java: #D4D4D4", "light_vs": "storage.modifier.import.java: #000000", "hc_black": "storage.modifier.import.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.import.java: #D4D4D4", + "dark_modern": "storage.modifier.import.java: #D4D4D4", "hc_light": "storage.modifier.import.java: #000000", - "light_plus_experimental": "storage.modifier.import.java: #000000" + "light_modern": "storage.modifier.import.java: #000000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "storage.modifier.import.java: #D4D4D4", "light_vs": "storage.modifier.import.java: #000000", "hc_black": "storage.modifier.import.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.import.java: #D4D4D4", + "dark_modern": "storage.modifier.import.java: #D4D4D4", "hc_light": "storage.modifier.import.java: #000000", - "light_plus_experimental": "storage.modifier.import.java: #000000" + "light_modern": "storage.modifier.import.java: #000000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "storage.modifier.import.java: #D4D4D4", "light_vs": "storage.modifier.import.java: #000000", "hc_black": "storage.modifier.import.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.import.java: #D4D4D4", + "dark_modern": "storage.modifier.import.java: #D4D4D4", "hc_light": "storage.modifier.import.java: #000000", - "light_plus_experimental": "storage.modifier.import.java: #000000" + "light_modern": "storage.modifier.import.java: #000000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "storage.modifier.import.java: #D4D4D4", "light_vs": "storage.modifier.import.java: #000000", "hc_black": "storage.modifier.import.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.import.java: #D4D4D4", + "dark_modern": "storage.modifier.import.java: #D4D4D4", "hc_light": "storage.modifier.import.java: #000000", - "light_plus_experimental": "storage.modifier.import.java: #000000" + "light_modern": "storage.modifier.import.java: #000000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "storage.modifier.import.java: #D4D4D4", "light_vs": "storage.modifier.import.java: #000000", "hc_black": "storage.modifier.import.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.import.java: #D4D4D4", + "dark_modern": "storage.modifier.import.java: #D4D4D4", "hc_light": "storage.modifier.import.java: #000000", - "light_plus_experimental": "storage.modifier.import.java: #000000" + "light_modern": "storage.modifier.import.java: #000000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "storage.modifier.import.java: #D4D4D4", "light_vs": "storage.modifier.import.java: #000000", "hc_black": "storage.modifier.import.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.import.java: #D4D4D4", + "dark_modern": "storage.modifier.import.java: #D4D4D4", "hc_light": "storage.modifier.import.java: #000000", - "light_plus_experimental": "storage.modifier.import.java: #000000" + "light_modern": "storage.modifier.import.java: #000000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "storage.modifier.import.java: #D4D4D4", "light_vs": "storage.modifier.import.java: #000000", "hc_black": "storage.modifier.import.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.import.java: #D4D4D4", + "dark_modern": "storage.modifier.import.java: #D4D4D4", "hc_light": "storage.modifier.import.java: #000000", - "light_plus_experimental": "storage.modifier.import.java: #000000" + "light_modern": "storage.modifier.import.java: #000000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "storage.modifier.import.java: #D4D4D4", "light_vs": "storage.modifier.import.java: #000000", "hc_black": "storage.modifier.import.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.import.java: #D4D4D4", + "dark_modern": "storage.modifier.import.java: #D4D4D4", "hc_light": "storage.modifier.import.java: #000000", - "light_plus_experimental": "storage.modifier.import.java: #000000" + "light_modern": "storage.modifier.import.java: #000000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "storage.modifier.import.java: #D4D4D4", "light_vs": "storage.modifier.import.java: #000000", "hc_black": "storage.modifier.import.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.import.java: #D4D4D4", + "dark_modern": "storage.modifier.import.java: #D4D4D4", "hc_light": "storage.modifier.import.java: #000000", - "light_plus_experimental": "storage.modifier.import.java: #000000" + "light_modern": "storage.modifier.import.java: #000000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "storage.modifier.import.java: #D4D4D4", "light_vs": "storage.modifier.import.java: #000000", "hc_black": "storage.modifier.import.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.import.java: #D4D4D4", + "dark_modern": "storage.modifier.import.java: #D4D4D4", "hc_light": "storage.modifier.import.java: #000000", - "light_plus_experimental": "storage.modifier.import.java: #000000" + "light_modern": "storage.modifier.import.java: #000000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "storage.modifier.import.java: #D4D4D4", "light_vs": "storage.modifier.import.java: #000000", "hc_black": "storage.modifier.import.java: #D4D4D4", - "dark_plus_experimental": "storage.modifier.import.java: #D4D4D4", + "dark_modern": "storage.modifier.import.java: #D4D4D4", "hc_light": "storage.modifier.import.java: #000000", - "light_plus_experimental": "storage.modifier.import.java: #000000" + "light_modern": "storage.modifier.import.java: #000000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "variable.language.wildcard.java: #D4D4D4", "light_vs": "variable.language.wildcard.java: #000000", "hc_black": "variable.language.wildcard.java: #D4D4D4", - "dark_plus_experimental": "variable.language.wildcard.java: #D4D4D4", + "dark_modern": "variable.language.wildcard.java: #D4D4D4", "hc_light": "variable.language.wildcard.java: #000000", - "light_plus_experimental": "variable.language.wildcard.java: #000000" + "light_modern": "variable.language.wildcard.java: #000000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.java: #4EC9B0", - "dark_plus_experimental": "storage.type.java: #4EC9B0", + "dark_modern": "storage.type.java: #4EC9B0", "hc_light": "storage.type.java: #185E73", - "light_plus_experimental": "storage.type.java: #267F99" + "light_modern": "storage.type.java: #267F99" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -624,9 +624,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -638,9 +638,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -666,9 +666,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.java: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.java: #4EC9B0", + "dark_modern": "storage.type.primitive.java: #4EC9B0", "hc_light": "storage.type.primitive.java: #185E73", - "light_plus_experimental": "storage.type.primitive.java: #267F99" + "light_modern": "storage.type.primitive.java: #267F99" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.java: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.java: #4EC9B0", + "dark_modern": "storage.type.primitive.java: #4EC9B0", "hc_light": "storage.type.primitive.java: #185E73", - "light_plus_experimental": "storage.type.primitive.java: #267F99" + "light_modern": "storage.type.primitive.java: #267F99" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.java: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.java: #4EC9B0", + "dark_modern": "storage.type.primitive.java: #4EC9B0", "hc_light": "storage.type.primitive.java: #185E73", - "light_plus_experimental": "storage.type.primitive.java: #267F99" + "light_modern": "storage.type.primitive.java: #267F99" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.java: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.java: #4EC9B0", + "dark_modern": "storage.type.primitive.java: #4EC9B0", "hc_light": "storage.type.primitive.java: #185E73", - "light_plus_experimental": "storage.type.primitive.java: #267F99" + "light_modern": "storage.type.primitive.java: #267F99" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.java: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.java: #4EC9B0", + "dark_modern": "storage.type.primitive.java: #4EC9B0", "hc_light": "storage.type.primitive.java: #185E73", - "light_plus_experimental": "storage.type.primitive.java: #267F99" + "light_modern": "storage.type.primitive.java: #267F99" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.annotation.java: #4EC9B0", - "dark_plus_experimental": "storage.type.annotation.java: #4EC9B0", + "dark_modern": "storage.type.annotation.java: #4EC9B0", "hc_light": "storage.type.annotation.java: #185E73", - "light_plus_experimental": "storage.type.annotation.java: #267F99" + "light_modern": "storage.type.annotation.java: #267F99" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.java: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.java: #4EC9B0", + "dark_modern": "storage.type.primitive.java: #4EC9B0", "hc_light": "storage.type.primitive.java: #185E73", - "light_plus_experimental": "storage.type.primitive.java: #267F99" + "light_modern": "storage.type.primitive.java: #267F99" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.java: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.java: #4EC9B0", + "dark_modern": "storage.type.primitive.java: #4EC9B0", "hc_light": "storage.type.primitive.java: #185E73", - "light_plus_experimental": "storage.type.primitive.java: #267F99" + "light_modern": "storage.type.primitive.java: #267F99" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.java: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.java: #4EC9B0", + "dark_modern": "storage.type.primitive.java: #4EC9B0", "hc_light": "storage.type.primitive.java: #185E73", - "light_plus_experimental": "storage.type.primitive.java: #267F99" + "light_modern": "storage.type.primitive.java: #267F99" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.annotation.java: #4EC9B0", - "dark_plus_experimental": "storage.type.annotation.java: #4EC9B0", + "dark_modern": "storage.type.annotation.java: #4EC9B0", "hc_light": "storage.type.annotation.java: #185E73", - "light_plus_experimental": "storage.type.annotation.java: #267F99" + "light_modern": "storage.type.annotation.java: #267F99" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.java: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.java: #4EC9B0", + "dark_modern": "storage.type.primitive.java: #4EC9B0", "hc_light": "storage.type.primitive.java: #185E73", - "light_plus_experimental": "storage.type.primitive.java: #267F99" + "light_modern": "storage.type.primitive.java: #267F99" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.java: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.java: #4EC9B0", + "dark_modern": "storage.type.primitive.java: #4EC9B0", "hc_light": "storage.type.primitive.java: #185E73", - "light_plus_experimental": "storage.type.primitive.java: #267F99" + "light_modern": "storage.type.primitive.java: #267F99" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.java: #4EC9B0", - "dark_plus_experimental": "storage.type.java: #4EC9B0", + "dark_modern": "storage.type.java: #4EC9B0", "hc_light": "storage.type.java: #185E73", - "light_plus_experimental": "storage.type.java: #267F99" + "light_modern": "storage.type.java: #267F99" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.generic.java: #4EC9B0", - "dark_plus_experimental": "storage.type.generic.java: #4EC9B0", + "dark_modern": "storage.type.generic.java: #4EC9B0", "hc_light": "storage.type.generic.java: #185E73", - "light_plus_experimental": "storage.type.generic.java: #267F99" + "light_modern": "storage.type.generic.java: #267F99" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/git-rebase-todo.json b/extensions/vscode-colorize-tests/test/colorize-results/git-rebase-todo.json index e292568d7e6..0ee7e4c7e7b 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/git-rebase-todo.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/git-rebase-todo.json @@ -8,9 +8,9 @@ "dark_vs": "support.function.git-rebase: #9CDCFE", "light_vs": "support.function.git-rebase: #0451A5", "hc_black": "support.function.git-rebase: #D4D4D4", - "dark_plus_experimental": "support.function.git-rebase: #9CDCFE", + "dark_modern": "support.function.git-rebase: #9CDCFE", "hc_light": "support.function.git-rebase: #0451A5", - "light_plus_experimental": "support.function.git-rebase: #0451A5" + "light_modern": "support.function.git-rebase: #0451A5" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "constant.sha.git-rebase: #B5CEA8", "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8", - "dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8", + "dark_modern": "constant.sha.git-rebase: #B5CEA8", "hc_light": "constant.sha.git-rebase: #096D48", - "light_plus_experimental": "constant.sha.git-rebase: #098658" + "light_modern": "constant.sha.git-rebase: #098658" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "support.function.git-rebase: #9CDCFE", "light_vs": "support.function.git-rebase: #0451A5", "hc_black": "support.function.git-rebase: #D4D4D4", - "dark_plus_experimental": "support.function.git-rebase: #9CDCFE", + "dark_modern": "support.function.git-rebase: #9CDCFE", "hc_light": "support.function.git-rebase: #0451A5", - "light_plus_experimental": "support.function.git-rebase: #0451A5" + "light_modern": "support.function.git-rebase: #0451A5" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "constant.sha.git-rebase: #B5CEA8", "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8", - "dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8", + "dark_modern": "constant.sha.git-rebase: #B5CEA8", "hc_light": "constant.sha.git-rebase: #096D48", - "light_plus_experimental": "constant.sha.git-rebase: #098658" + "light_modern": "constant.sha.git-rebase: #098658" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "support.function.git-rebase: #9CDCFE", "light_vs": "support.function.git-rebase: #0451A5", "hc_black": "support.function.git-rebase: #D4D4D4", - "dark_plus_experimental": "support.function.git-rebase: #9CDCFE", + "dark_modern": "support.function.git-rebase: #9CDCFE", "hc_light": "support.function.git-rebase: #0451A5", - "light_plus_experimental": "support.function.git-rebase: #0451A5" + "light_modern": "support.function.git-rebase: #0451A5" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "constant.sha.git-rebase: #B5CEA8", "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8", - "dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8", + "dark_modern": "constant.sha.git-rebase: #B5CEA8", "hc_light": "constant.sha.git-rebase: #096D48", - "light_plus_experimental": "constant.sha.git-rebase: #098658" + "light_modern": "constant.sha.git-rebase: #098658" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "support.function.git-rebase: #9CDCFE", "light_vs": "support.function.git-rebase: #0451A5", "hc_black": "support.function.git-rebase: #D4D4D4", - "dark_plus_experimental": "support.function.git-rebase: #9CDCFE", + "dark_modern": "support.function.git-rebase: #9CDCFE", "hc_light": "support.function.git-rebase: #0451A5", - "light_plus_experimental": "support.function.git-rebase: #0451A5" + "light_modern": "support.function.git-rebase: #0451A5" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "constant.sha.git-rebase: #B5CEA8", "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8", - "dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8", + "dark_modern": "constant.sha.git-rebase: #B5CEA8", "hc_light": "constant.sha.git-rebase: #096D48", - "light_plus_experimental": "constant.sha.git-rebase: #098658" + "light_modern": "constant.sha.git-rebase: #098658" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "support.function.git-rebase: #9CDCFE", "light_vs": "support.function.git-rebase: #0451A5", "hc_black": "support.function.git-rebase: #D4D4D4", - "dark_plus_experimental": "support.function.git-rebase: #9CDCFE", + "dark_modern": "support.function.git-rebase: #9CDCFE", "hc_light": "support.function.git-rebase: #0451A5", - "light_plus_experimental": "support.function.git-rebase: #0451A5" + "light_modern": "support.function.git-rebase: #0451A5" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "constant.sha.git-rebase: #B5CEA8", "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8", - "dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8", + "dark_modern": "constant.sha.git-rebase: #B5CEA8", "hc_light": "constant.sha.git-rebase: #096D48", - "light_plus_experimental": "constant.sha.git-rebase: #098658" + "light_modern": "constant.sha.git-rebase: #098658" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "support.function.git-rebase: #9CDCFE", "light_vs": "support.function.git-rebase: #0451A5", "hc_black": "support.function.git-rebase: #D4D4D4", - "dark_plus_experimental": "support.function.git-rebase: #9CDCFE", + "dark_modern": "support.function.git-rebase: #9CDCFE", "hc_light": "support.function.git-rebase: #0451A5", - "light_plus_experimental": "support.function.git-rebase: #0451A5" + "light_modern": "support.function.git-rebase: #0451A5" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "constant.sha.git-rebase: #B5CEA8", "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8", - "dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8", + "dark_modern": "constant.sha.git-rebase: #B5CEA8", "hc_light": "constant.sha.git-rebase: #096D48", - "light_plus_experimental": "constant.sha.git-rebase: #098658" + "light_modern": "constant.sha.git-rebase: #098658" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "support.function.git-rebase: #9CDCFE", "light_vs": "support.function.git-rebase: #0451A5", "hc_black": "support.function.git-rebase: #D4D4D4", - "dark_plus_experimental": "support.function.git-rebase: #9CDCFE", + "dark_modern": "support.function.git-rebase: #9CDCFE", "hc_light": "support.function.git-rebase: #0451A5", - "light_plus_experimental": "support.function.git-rebase: #0451A5" + "light_modern": "support.function.git-rebase: #0451A5" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "constant.sha.git-rebase: #B5CEA8", "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8", - "dark_plus_experimental": "constant.sha.git-rebase: #B5CEA8", + "dark_modern": "constant.sha.git-rebase: #B5CEA8", "hc_light": "constant.sha.git-rebase: #096D48", - "light_plus_experimental": "constant.sha.git-rebase: #098658" + "light_modern": "constant.sha.git-rebase: #098658" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -568,9 +568,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -624,9 +624,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json index 1cbe9e0ffb5..dac84162b3c 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json @@ -8,9 +8,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -148,9 +148,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json index c66c80829e3..77914003b54 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "punctuation.section.embedded.begin.php: #569CD6", "light_vs": "punctuation.section.embedded.begin.php: #800000", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded.begin.php: #569CD6", + "dark_modern": "punctuation.section.embedded.begin.php: #569CD6", "hc_light": "punctuation.section.embedded.begin.php: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded.begin.php: #800000" + "light_modern": "punctuation.section.embedded.begin.php: #800000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -134,9 +134,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -162,9 +162,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -176,9 +176,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -232,9 +232,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -246,9 +246,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -316,9 +316,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -344,9 +344,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -358,9 +358,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -386,9 +386,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -400,9 +400,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -428,9 +428,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -442,9 +442,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -456,9 +456,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -470,9 +470,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -484,9 +484,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -526,9 +526,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -568,9 +568,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "punctuation.section.embedded.end.php: #569CD6", "light_vs": "punctuation.section.embedded.end.php: #800000", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded.end.php: #569CD6", + "dark_modern": "punctuation.section.embedded.end.php: #569CD6", "hc_light": "punctuation.section.embedded.end.php: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded.end.php: #800000" + "light_modern": "punctuation.section.embedded.end.php: #800000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "punctuation.section.embedded.end.php: #569CD6", "light_vs": "punctuation.section.embedded.end.php: #800000", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded.end.php: #569CD6", + "dark_modern": "punctuation.section.embedded.end.php: #569CD6", "hc_light": "punctuation.section.embedded.end.php: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded.end.php: #800000" + "light_modern": "punctuation.section.embedded.end.php: #800000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -624,9 +624,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json index 26331392500..e1aa82e9ca3 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json index 578b7f38f9b..2066b677e2c 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json @@ -8,9 +8,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.yaml: #0F4A85", - "light_plus_experimental": "string.quoted.single.yaml: #0000FF" + "light_modern": "string.quoted.single.yaml: #0000FF" } }, { @@ -64,9 +64,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.yaml: #0F4A85", - "light_plus_experimental": "string.quoted.single.yaml: #0000FF" + "light_modern": "string.quoted.single.yaml: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.yaml: #0F4A85", - "light_plus_experimental": "string.quoted.single.yaml: #0000FF" + "light_modern": "string.quoted.single.yaml: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.yaml: #0F4A85", - "light_plus_experimental": "string.quoted.single.yaml: #0000FF" + "light_modern": "string.quoted.single.yaml: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.yaml: #0F4A85", - "light_plus_experimental": "string.quoted.single.yaml: #0000FF" + "light_modern": "string.quoted.single.yaml: #0000FF" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.yaml: #0F4A85", - "light_plus_experimental": "string.quoted.single.yaml: #0000FF" + "light_modern": "string.quoted.single.yaml: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.yaml: #0F4A85", - "light_plus_experimental": "string.quoted.single.yaml: #0000FF" + "light_modern": "string.quoted.single.yaml: #0000FF" } }, { @@ -232,9 +232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.yaml: #0F4A85", - "light_plus_experimental": "string.quoted.single.yaml: #0000FF" + "light_modern": "string.quoted.single.yaml: #0000FF" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.yaml: #0F4A85", - "light_plus_experimental": "string.quoted.single.yaml: #0000FF" + "light_modern": "string.quoted.single.yaml: #0000FF" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-76997_php.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-76997_php.json index 12846f594f6..60bff0cddfc 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/issue-76997_php.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-76997_php.json @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json index a06a8f18c88..b03ac95a7f9 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -232,9 +232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -274,9 +274,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -288,9 +288,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -302,9 +302,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -316,9 +316,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -330,9 +330,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -344,9 +344,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -358,9 +358,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -456,9 +456,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -666,9 +666,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -680,9 +680,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -778,9 +778,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -792,9 +792,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4474,9 +4474,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4488,9 +4488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4502,9 +4502,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4516,9 +4516,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4530,9 +4530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4544,9 +4544,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4558,9 +4558,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4572,9 +4572,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4586,9 +4586,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4600,9 +4600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4614,9 +4614,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4628,9 +4628,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4642,9 +4642,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4656,9 +4656,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4670,9 +4670,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4684,9 +4684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4698,9 +4698,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4712,9 +4712,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4726,9 +4726,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4740,9 +4740,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4754,9 +4754,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4768,9 +4768,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4782,9 +4782,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -4796,9 +4796,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4810,9 +4810,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4824,9 +4824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4838,9 +4838,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4852,9 +4852,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -4866,9 +4866,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4880,9 +4880,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4894,9 +4894,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4908,9 +4908,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4922,9 +4922,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4936,9 +4936,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4950,9 +4950,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4964,9 +4964,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4978,9 +4978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4992,9 +4992,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5006,9 +5006,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json b/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json index a811aa95d1d..1f650e7f45e 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -120,9 +120,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -134,9 +134,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -176,9 +176,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -190,9 +190,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -274,9 +274,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -288,9 +288,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -344,9 +344,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -414,9 +414,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -470,9 +470,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -512,9 +512,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -568,9 +568,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -582,9 +582,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -610,9 +610,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -624,9 +624,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -638,9 +638,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -652,9 +652,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -708,9 +708,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -736,9 +736,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -750,9 +750,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -778,9 +778,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -792,9 +792,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -806,9 +806,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -820,9 +820,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -848,9 +848,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -862,9 +862,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -890,9 +890,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -932,9 +932,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -946,9 +946,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -988,9 +988,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4474,9 +4474,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4488,9 +4488,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4502,9 +4502,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4516,9 +4516,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4530,9 +4530,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4544,9 +4544,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4558,9 +4558,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4572,9 +4572,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4586,9 +4586,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4600,9 +4600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4614,9 +4614,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4628,9 +4628,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4642,9 +4642,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4656,9 +4656,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4670,9 +4670,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4684,9 +4684,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4698,9 +4698,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4712,9 +4712,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4726,9 +4726,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4740,9 +4740,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4754,9 +4754,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4768,9 +4768,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4782,9 +4782,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4796,9 +4796,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4810,9 +4810,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -4824,9 +4824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4838,9 +4838,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4852,9 +4852,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4866,9 +4866,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4880,9 +4880,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4894,9 +4894,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4908,9 +4908,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4922,9 +4922,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4936,9 +4936,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4950,9 +4950,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4964,9 +4964,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4978,9 +4978,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4992,9 +4992,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5006,9 +5006,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5020,9 +5020,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5034,9 +5034,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5048,9 +5048,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5062,9 +5062,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5076,9 +5076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5090,9 +5090,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5104,9 +5104,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5118,9 +5118,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5132,9 +5132,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5146,9 +5146,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5160,9 +5160,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5174,9 +5174,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5188,9 +5188,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5202,9 +5202,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5216,9 +5216,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5230,9 +5230,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5244,9 +5244,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -5258,9 +5258,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5272,9 +5272,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5286,9 +5286,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5300,9 +5300,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -5314,9 +5314,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -5328,9 +5328,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -5342,9 +5342,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5356,9 +5356,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5370,9 +5370,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5384,9 +5384,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5398,9 +5398,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -5412,9 +5412,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5426,9 +5426,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5440,9 +5440,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5454,9 +5454,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5468,9 +5468,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5482,9 +5482,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5496,9 +5496,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -5510,9 +5510,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5524,9 +5524,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5538,9 +5538,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5552,9 +5552,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5566,9 +5566,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5580,9 +5580,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5594,9 +5594,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5608,9 +5608,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5622,9 +5622,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5636,9 +5636,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -5650,9 +5650,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5664,9 +5664,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5678,9 +5678,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5692,9 +5692,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5706,9 +5706,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5720,9 +5720,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5734,9 +5734,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -5748,9 +5748,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5762,9 +5762,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5776,9 +5776,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5790,9 +5790,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5804,9 +5804,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5818,9 +5818,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5832,9 +5832,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -5846,9 +5846,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -5860,9 +5860,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -5874,9 +5874,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5888,9 +5888,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5902,9 +5902,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5916,9 +5916,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5930,9 +5930,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5944,9 +5944,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -5958,9 +5958,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5972,9 +5972,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -5986,9 +5986,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6000,9 +6000,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6014,9 +6014,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -6028,9 +6028,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6042,9 +6042,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6056,9 +6056,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6070,9 +6070,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6084,9 +6084,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6098,9 +6098,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6112,9 +6112,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6126,9 +6126,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6140,9 +6140,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6154,9 +6154,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6168,9 +6168,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6182,9 +6182,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6196,9 +6196,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6210,9 +6210,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6224,9 +6224,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6238,9 +6238,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6252,9 +6252,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6266,9 +6266,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -6280,9 +6280,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6294,9 +6294,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6308,9 +6308,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6322,9 +6322,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6336,9 +6336,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -6350,9 +6350,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6364,9 +6364,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6378,9 +6378,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6392,9 +6392,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6406,9 +6406,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -6420,9 +6420,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6434,9 +6434,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6448,9 +6448,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6462,9 +6462,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6476,9 +6476,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6490,9 +6490,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -6504,9 +6504,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -6518,9 +6518,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -6532,9 +6532,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6546,9 +6546,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6560,9 +6560,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6574,9 +6574,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -6588,9 +6588,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6602,9 +6602,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6616,9 +6616,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6630,9 +6630,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6644,9 +6644,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -6658,9 +6658,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6672,9 +6672,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6686,9 +6686,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6700,9 +6700,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6714,9 +6714,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -6728,9 +6728,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6742,9 +6742,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6756,9 +6756,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6770,9 +6770,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6784,9 +6784,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6798,9 +6798,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -6812,9 +6812,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -6826,9 +6826,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -6840,9 +6840,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6854,9 +6854,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -6868,9 +6868,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -6882,9 +6882,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -6896,9 +6896,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6910,9 +6910,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6924,9 +6924,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6938,9 +6938,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -6952,9 +6952,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6966,9 +6966,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6980,9 +6980,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -6994,9 +6994,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -7008,9 +7008,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7022,9 +7022,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7036,9 +7036,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7050,9 +7050,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7064,9 +7064,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7078,9 +7078,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7092,9 +7092,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7106,9 +7106,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7120,9 +7120,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7134,9 +7134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7148,9 +7148,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7162,9 +7162,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7176,9 +7176,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7190,9 +7190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7204,9 +7204,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7218,9 +7218,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7232,9 +7232,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7246,9 +7246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7260,9 +7260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7274,9 +7274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7288,9 +7288,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7302,9 +7302,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7316,9 +7316,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7330,9 +7330,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7344,9 +7344,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7358,9 +7358,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7372,9 +7372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7386,9 +7386,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7400,9 +7400,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7414,9 +7414,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7428,9 +7428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7442,9 +7442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7456,9 +7456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7470,9 +7470,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -7484,9 +7484,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7498,9 +7498,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7512,9 +7512,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7526,9 +7526,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7540,9 +7540,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7554,9 +7554,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7568,9 +7568,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7582,9 +7582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7596,9 +7596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7610,9 +7610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7624,9 +7624,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7638,9 +7638,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7652,9 +7652,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7666,9 +7666,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7680,9 +7680,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7694,9 +7694,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7708,9 +7708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7722,9 +7722,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7736,9 +7736,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7750,9 +7750,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7764,9 +7764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7778,9 +7778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7792,9 +7792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7806,9 +7806,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -7820,9 +7820,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7834,9 +7834,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7848,9 +7848,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7862,9 +7862,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7876,9 +7876,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7890,9 +7890,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7904,9 +7904,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -7918,9 +7918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7932,9 +7932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7946,9 +7946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7960,9 +7960,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7974,9 +7974,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -7988,9 +7988,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -8002,9 +8002,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8016,9 +8016,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8030,9 +8030,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8044,9 +8044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8058,9 +8058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8072,9 +8072,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -8086,9 +8086,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -8100,9 +8100,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -8114,9 +8114,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8128,9 +8128,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -8142,9 +8142,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -8156,9 +8156,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8170,9 +8170,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -8184,9 +8184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8198,9 +8198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8212,9 +8212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8226,9 +8226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8240,9 +8240,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8254,9 +8254,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8268,9 +8268,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8282,9 +8282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8296,9 +8296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8310,9 +8310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8324,9 +8324,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8338,9 +8338,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8352,9 +8352,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8366,9 +8366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8380,9 +8380,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -8394,9 +8394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-13777_go.json b/extensions/vscode-colorize-tests/test/colorize-results/test-13777_go.json index 0fad4d65894..dbbcbe73add 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-13777_go.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-13777_go.json @@ -8,9 +8,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-173216_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test-173216_sh.json index a166e7d96f4..c24aadf2ed9 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-173216_sh.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-173216_sh.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -260,9 +260,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -316,9 +316,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -330,9 +330,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -386,9 +386,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -400,9 +400,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -540,9 +540,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -554,9 +554,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -568,9 +568,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -582,9 +582,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -596,9 +596,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-173224_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test-173224_sh.json index cc9fa142543..2009a29baad 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-173224_sh.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-173224_sh.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -50,9 +50,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -106,9 +106,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -148,9 +148,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json index 0a1300285e8..198ace22005 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -50,9 +50,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -120,9 +120,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -484,9 +484,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -540,9 +540,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -554,9 +554,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -568,9 +568,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -582,9 +582,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -652,9 +652,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -666,9 +666,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -708,9 +708,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -722,9 +722,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -736,9 +736,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -750,9 +750,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -764,9 +764,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -778,9 +778,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -792,9 +792,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -806,9 +806,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -820,9 +820,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json index 38f4610efcd..79e4727a417 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -36,9 +36,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -64,9 +64,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -92,9 +92,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -106,9 +106,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -120,9 +120,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -148,9 +148,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json index b618cd3383d..a5e6addc3b1 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -36,9 +36,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -78,9 +78,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -92,9 +92,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-33886_md.json b/extensions/vscode-colorize-tests/test/colorize-results/test-33886_md.json index a011190e871..645a855fc16 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-33886_md.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-33886_md.json @@ -8,9 +8,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } } ] \ No newline at end of file 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 96f7cac13a9..0dc90cecce7 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 @@ -8,9 +8,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.comment.buffered.block.pug: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.comment.buffered.block.pug: #0F4A85", - "light_plus_experimental": "string.comment.buffered.block.pug: #0000FF" + "light_modern": "string.comment.buffered.block.pug: #0000FF" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json b/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json index 4e36a69f4e3..9897e09a654 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json @@ -8,9 +8,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -484,9 +484,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -988,9 +988,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ 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 e19207a8c79..3c4f2e0571d 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 @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -148,9 +148,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -176,9 +176,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -232,9 +232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -414,9 +414,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -428,9 +428,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -568,9 +568,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -624,9 +624,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -736,9 +736,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json index 384ab0f8b35..16438692b78 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -36,9 +36,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -64,9 +64,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -92,9 +92,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -120,9 +120,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -134,9 +134,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -148,9 +148,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -162,9 +162,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -176,9 +176,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -204,9 +204,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -218,9 +218,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -232,9 +232,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -246,9 +246,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -274,9 +274,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -288,9 +288,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -302,9 +302,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -316,9 +316,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -358,9 +358,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -372,9 +372,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -386,9 +386,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -400,9 +400,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -414,9 +414,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -428,9 +428,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -470,9 +470,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -484,9 +484,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -498,9 +498,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -540,9 +540,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -554,9 +554,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -568,9 +568,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -582,9 +582,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -596,9 +596,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -610,9 +610,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -624,9 +624,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -638,9 +638,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -652,9 +652,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -666,9 +666,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -680,9 +680,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -708,9 +708,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -722,9 +722,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -736,9 +736,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -750,9 +750,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -778,9 +778,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -792,9 +792,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -806,9 +806,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -820,9 +820,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -834,9 +834,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -848,9 +848,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -862,9 +862,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -876,9 +876,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -890,9 +890,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -904,9 +904,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -918,9 +918,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -932,9 +932,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -946,9 +946,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -960,9 +960,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -974,9 +974,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -988,9 +988,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.scope-resolution: #4EC9B0", - "dark_plus_experimental": "entity.name.scope-resolution: #4EC9B0", + "dark_modern": "entity.name.scope-resolution: #4EC9B0", "hc_light": "entity.name.scope-resolution: #185E73", - "light_plus_experimental": "entity.name.scope-resolution: #267F99" + "light_modern": "entity.name.scope-resolution: #267F99" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-80644_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-80644_cpp.json index 5828221dc84..c3eebff0ef4 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-80644_cpp.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-80644_cpp.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.scope-resolution: #4EC9B0", - "dark_plus_experimental": "entity.name.scope-resolution: #4EC9B0", + "dark_modern": "entity.name.scope-resolution: #4EC9B0", "hc_light": "entity.name.scope-resolution: #185E73", - "light_plus_experimental": "entity.name.scope-resolution: #267F99" + "light_modern": "entity.name.scope-resolution: #267F99" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-brackets_tsx.json b/extensions/vscode-colorize-tests/test/colorize-results/test-brackets_tsx.json index 00234033ef7..2b5d45b6adb 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-brackets_tsx.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-brackets_tsx.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -316,9 +316,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -540,9 +540,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ 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 8e79bc84869..859e808c155 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 @@ -8,9 +8,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -148,9 +148,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -680,9 +680,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file 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 48d43e55e0b..f5cddc27d06 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 @@ -8,9 +8,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -652,9 +652,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file 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 fea9685a5b7..5e41ff044b4 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 @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -64,9 +64,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -92,9 +92,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -120,9 +120,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -148,9 +148,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -372,9 +372,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -456,9 +456,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -470,9 +470,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -540,9 +540,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -554,9 +554,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -568,9 +568,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -638,9 +638,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -652,9 +652,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -666,9 +666,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.html: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -736,9 +736,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.html: #0F4A85", - "light_plus_experimental": "string.unquoted.html: #0000FF" + "light_modern": "string.unquoted.html: #0000FF" } }, { @@ -750,9 +750,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -778,9 +778,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -806,9 +806,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -820,9 +820,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -890,9 +890,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -904,9 +904,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -918,9 +918,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -932,9 +932,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -946,9 +946,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -960,9 +960,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -974,9 +974,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -988,9 +988,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.html: #0F4A85", - "light_plus_experimental": "string.unquoted.html: #0000FF" + "light_modern": "string.unquoted.html: #0000FF" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json index 83f66899cb8..432ecde8cce 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -582,9 +582,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -596,9 +596,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -708,9 +708,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -722,9 +722,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -736,9 +736,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -750,9 +750,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -764,9 +764,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "invalid: #F44747", "light_vs": "invalid: #CD3131", "hc_black": "invalid: #F44747", - "dark_plus_experimental": "invalid: #F44747", + "dark_modern": "invalid: #F44747", "hc_light": "invalid: #B5200D", - "light_plus_experimental": "invalid: #CD3131" + "light_modern": "invalid: #CD3131" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56476_ps1.json b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56476_ps1.json index f0ecf0249e1..50919dc27de 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56476_ps1.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56476_ps1.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-function-inv_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-function-inv_ts.json index c94617a7bdd..a45de974884 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-function-inv_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-function-inv_ts.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "keyword.operator.new: #569CD6", "light_vs": "keyword.operator.new: #0000FF", "hc_black": "keyword.operator.new: #569CD6", - "dark_plus_experimental": "keyword.operator.new: #569CD6", + "dark_modern": "keyword.operator.new: #569CD6", "hc_light": "keyword.operator.new: #0F4A85", - "light_plus_experimental": "keyword.operator.new: #0000FF" + "light_modern": "keyword.operator.new: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json index a2ec95bc126..68717cc4939 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -316,9 +316,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -400,9 +400,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -554,9 +554,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -568,9 +568,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -624,9 +624,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -694,9 +694,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -834,9 +834,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -848,9 +848,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -904,9 +904,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -918,9 +918,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -974,9 +974,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.other.constant: #4FC1FF", + "dark_modern": "variable.other.constant: #4FC1FF", "hc_light": "variable.other.constant: #02715D", - "light_plus_experimental": "variable.other.constant: #0070C1" + "light_modern": "variable.other.constant: #0070C1" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json index da5c1d12c28..c1988500c97 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.other.constant: #4FC1FF", + "dark_modern": "variable.other.constant: #4FC1FF", "hc_light": "variable.other.constant: #02715D", - "light_plus_experimental": "variable.other.constant: #0070C1" + "light_modern": "variable.other.constant: #0070C1" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -372,9 +372,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -386,9 +386,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -456,9 +456,9 @@ "dark_vs": "punctuation.definition.template-expression.begin: #569CD6", "light_vs": "punctuation.definition.template-expression.begin: #0000FF", "hc_black": "punctuation.definition.template-expression.begin: #569CD6", - "dark_plus_experimental": "punctuation.definition.template-expression.begin: #569CD6", + "dark_modern": "punctuation.definition.template-expression.begin: #569CD6", "hc_light": "punctuation.definition.template-expression.begin: #0F4A85", - "light_plus_experimental": "punctuation.definition.template-expression.begin: #0000FF" + "light_modern": "punctuation.definition.template-expression.begin: #0000FF" } }, { @@ -470,9 +470,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -484,9 +484,9 @@ "dark_vs": "punctuation.definition.template-expression.end: #569CD6", "light_vs": "punctuation.definition.template-expression.end: #0000FF", "hc_black": "punctuation.definition.template-expression.end: #569CD6", - "dark_plus_experimental": "punctuation.definition.template-expression.end: #569CD6", + "dark_modern": "punctuation.definition.template-expression.end: #569CD6", "hc_light": "punctuation.definition.template-expression.end: #0F4A85", - "light_plus_experimental": "punctuation.definition.template-expression.end: #0000FF" + "light_modern": "punctuation.definition.template-expression.end: #0000FF" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -512,9 +512,9 @@ "dark_vs": "punctuation.definition.template-expression.begin: #569CD6", "light_vs": "punctuation.definition.template-expression.begin: #0000FF", "hc_black": "punctuation.definition.template-expression.begin: #569CD6", - "dark_plus_experimental": "punctuation.definition.template-expression.begin: #569CD6", + "dark_modern": "punctuation.definition.template-expression.begin: #569CD6", "hc_light": "punctuation.definition.template-expression.begin: #0F4A85", - "light_plus_experimental": "punctuation.definition.template-expression.begin: #0000FF" + "light_modern": "punctuation.definition.template-expression.begin: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -540,9 +540,9 @@ "dark_vs": "punctuation.definition.template-expression.end: #569CD6", "light_vs": "punctuation.definition.template-expression.end: #0000FF", "hc_black": "punctuation.definition.template-expression.end: #569CD6", - "dark_plus_experimental": "punctuation.definition.template-expression.end: #569CD6", + "dark_modern": "punctuation.definition.template-expression.end: #569CD6", "hc_light": "punctuation.definition.template-expression.end: #0F4A85", - "light_plus_experimental": "punctuation.definition.template-expression.end: #0000FF" + "light_modern": "punctuation.definition.template-expression.end: #0000FF" } }, { @@ -554,9 +554,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json index 28b6177b810..4282511c5e8 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -246,9 +246,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -302,9 +302,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -316,9 +316,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5566_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5566_ts.json index 0881c013846..177ea3c978c 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5566_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5566_ts.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -372,9 +372,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -386,9 +386,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -442,9 +442,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -456,9 +456,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-jsdoc-multiline-type_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-jsdoc-multiline-type_ts.json index 726fd6cc039..130b3a92fcc 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-jsdoc-multiline-type_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-jsdoc-multiline-type_ts.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -64,9 +64,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -92,9 +92,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -106,9 +106,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -134,9 +134,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -162,9 +162,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -190,9 +190,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -218,9 +218,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -232,9 +232,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -260,9 +260,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -274,9 +274,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -470,9 +470,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -498,9 +498,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -512,9 +512,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -540,9 +540,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -568,9 +568,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -596,9 +596,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -624,9 +624,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -652,9 +652,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -680,9 +680,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -694,9 +694,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -722,9 +722,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -736,9 +736,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -750,9 +750,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json index 6a8235404fb..a365ac3d098 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "keyword.operator.new: #569CD6", "light_vs": "keyword.operator.new: #0000FF", "hc_black": "keyword.operator.new: #569CD6", - "dark_plus_experimental": "keyword.operator.new: #569CD6", + "dark_modern": "keyword.operator.new: #569CD6", "hc_light": "keyword.operator.new: #0F4A85", - "light_plus_experimental": "keyword.operator.new: #0000FF" + "light_modern": "keyword.operator.new: #0000FF" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -260,9 +260,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-members_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-members_ts.json index 72780554932..748ac943c3c 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-members_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-members_ts.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.other.inherited-class: #4EC9B0", - "dark_plus_experimental": "entity.other.inherited-class: #4EC9B0", + "dark_modern": "entity.other.inherited-class: #4EC9B0", "hc_light": "entity.other.inherited-class: #185E73", - "light_plus_experimental": "entity.other.inherited-class: #267F99" + "light_modern": "entity.other.inherited-class: #267F99" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -190,9 +190,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-object-literals_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-object-literals_ts.json index e044831ffb9..1b1f1bb887c 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-object-literals_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-object-literals_ts.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file 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 014e5d5723a..64a84418eb3 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 @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178", + "dark_modern": "punctuation.definition.group.regexp: #CE9178", "hc_light": "punctuation.definition.group.regexp: #D16969", - "light_plus_experimental": "punctuation.definition.group.regexp: #D16969" + "light_modern": "punctuation.definition.group.regexp: #D16969" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.character-class.regexp: #D16969", + "dark_modern": "constant.character.character-class.regexp: #D16969", "hc_light": "constant.character.character-class.regexp: #811F3F", - "light_plus_experimental": "constant.character.character-class.regexp: #811F3F" + "light_modern": "constant.character.character-class.regexp: #811F3F" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator.quantifier.regexp: #D7BA7D", + "dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D", "hc_light": "keyword.operator.quantifier.regexp: #000000", - "light_plus_experimental": "keyword.operator.quantifier.regexp: #000000" + "light_modern": "keyword.operator.quantifier.regexp: #000000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178", + "dark_modern": "punctuation.definition.group.regexp: #CE9178", "hc_light": "punctuation.definition.group.regexp: #D16969", - "light_plus_experimental": "punctuation.definition.group.regexp: #D16969" + "light_modern": "punctuation.definition.group.regexp: #D16969" } }, { @@ -148,9 +148,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -190,9 +190,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -260,9 +260,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -274,9 +274,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -470,9 +470,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -540,9 +540,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -568,9 +568,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -582,9 +582,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -596,9 +596,9 @@ "dark_vs": "source.coffee.embedded: #9CDCFE", "light_vs": "source.coffee.embedded: #E50000", "hc_black": "source.coffee.embedded: #D4D4D4", - "dark_plus_experimental": "source.coffee.embedded: #9CDCFE", + "dark_modern": "source.coffee.embedded: #9CDCFE", "hc_light": "source.coffee.embedded: #264F78", - "light_plus_experimental": "source.coffee.embedded: #E50000" + "light_modern": "source.coffee.embedded: #E50000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -624,9 +624,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -638,9 +638,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -750,9 +750,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -918,9 +918,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-strings_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-strings_ts.json index 72cf1ed35ee..8c1a7f610c2 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-strings_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-strings_ts.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -120,9 +120,9 @@ "dark_vs": "punctuation.definition.template-expression.begin: #569CD6", "light_vs": "punctuation.definition.template-expression.begin: #0000FF", "hc_black": "punctuation.definition.template-expression.begin: #569CD6", - "dark_plus_experimental": "punctuation.definition.template-expression.begin: #569CD6", + "dark_modern": "punctuation.definition.template-expression.begin: #569CD6", "hc_light": "punctuation.definition.template-expression.begin: #0F4A85", - "light_plus_experimental": "punctuation.definition.template-expression.begin: #0000FF" + "light_modern": "punctuation.definition.template-expression.begin: #0000FF" } }, { @@ -134,9 +134,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -148,9 +148,9 @@ "dark_vs": "punctuation.definition.template-expression.end: #569CD6", "light_vs": "punctuation.definition.template-expression.end: #0000FF", "hc_black": "punctuation.definition.template-expression.end: #569CD6", - "dark_plus_experimental": "punctuation.definition.template-expression.end: #569CD6", + "dark_modern": "punctuation.definition.template-expression.end: #569CD6", "hc_light": "punctuation.definition.template-expression.end: #0F4A85", - "light_plus_experimental": "punctuation.definition.template-expression.end: #0000FF" + "light_modern": "punctuation.definition.template-expression.end: #0000FF" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -274,9 +274,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -288,9 +288,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -302,9 +302,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -414,9 +414,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -428,9 +428,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -442,9 +442,9 @@ "dark_vs": "punctuation.definition.template-expression.begin: #569CD6", "light_vs": "punctuation.definition.template-expression.begin: #0000FF", "hc_black": "punctuation.definition.template-expression.begin: #569CD6", - "dark_plus_experimental": "punctuation.definition.template-expression.begin: #569CD6", + "dark_modern": "punctuation.definition.template-expression.begin: #569CD6", "hc_light": "punctuation.definition.template-expression.begin: #0F4A85", - "light_plus_experimental": "punctuation.definition.template-expression.begin: #0000FF" + "light_modern": "punctuation.definition.template-expression.begin: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -470,9 +470,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -484,9 +484,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -540,9 +540,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "punctuation.definition.template-expression.end: #569CD6", "light_vs": "punctuation.definition.template-expression.end: #0000FF", "hc_black": "punctuation.definition.template-expression.end: #569CD6", - "dark_plus_experimental": "punctuation.definition.template-expression.end: #569CD6", + "dark_modern": "punctuation.definition.template-expression.end: #569CD6", "hc_light": "punctuation.definition.template-expression.end: #0F4A85", - "light_plus_experimental": "punctuation.definition.template-expression.end: #0000FF" + "light_modern": "punctuation.definition.template-expression.end: #0000FF" } }, { @@ -568,9 +568,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -582,9 +582,9 @@ "dark_vs": "punctuation.definition.template-expression.begin: #569CD6", "light_vs": "punctuation.definition.template-expression.begin: #0000FF", "hc_black": "punctuation.definition.template-expression.begin: #569CD6", - "dark_plus_experimental": "punctuation.definition.template-expression.begin: #569CD6", + "dark_modern": "punctuation.definition.template-expression.begin: #569CD6", "hc_light": "punctuation.definition.template-expression.begin: #0F4A85", - "light_plus_experimental": "punctuation.definition.template-expression.begin: #0000FF" + "light_modern": "punctuation.definition.template-expression.begin: #0000FF" } }, { @@ -596,9 +596,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -624,9 +624,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -680,9 +680,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "punctuation.definition.template-expression.end: #569CD6", "light_vs": "punctuation.definition.template-expression.end: #0000FF", "hc_black": "punctuation.definition.template-expression.end: #569CD6", - "dark_plus_experimental": "punctuation.definition.template-expression.end: #569CD6", + "dark_modern": "punctuation.definition.template-expression.end: #569CD6", "hc_light": "punctuation.definition.template-expression.end: #0F4A85", - "light_plus_experimental": "punctuation.definition.template-expression.end: #0000FF" + "light_modern": "punctuation.definition.template-expression.end: #0000FF" } }, { @@ -708,9 +708,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-this_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-this_ts.json index 9a33c4fa099..c138146ccbc 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-this_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-this_ts.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file 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 f2be50195dd..8819269523a 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 @@ -8,9 +8,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "variable.css: #9CDCFE", "light_vs": "variable.css: #E50000", "hc_black": "variable.css: #D4D4D4", - "dark_plus_experimental": "variable.css: #9CDCFE", + "dark_modern": "variable.css: #9CDCFE", "hc_light": "variable.css: #264F78", - "light_plus_experimental": "variable.css: #E50000" + "light_modern": "variable.css: #E50000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "variable.css: #9CDCFE", "light_vs": "variable.css: #E50000", "hc_black": "variable.css: #D4D4D4", - "dark_plus_experimental": "variable.css: #9CDCFE", + "dark_modern": "variable.css: #9CDCFE", "hc_light": "variable.css: #264F78", - "light_plus_experimental": "variable.css: #E50000" + "light_modern": "variable.css: #E50000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -624,9 +624,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json b/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json index ff5b189b970..7d7b3bbe3e5 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -50,9 +50,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -64,9 +64,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -218,9 +218,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -260,9 +260,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -274,9 +274,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -288,9 +288,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -330,9 +330,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -344,9 +344,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -358,9 +358,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -442,9 +442,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -484,9 +484,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -540,9 +540,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -554,9 +554,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -596,9 +596,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -610,9 +610,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -624,9 +624,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -848,9 +848,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json b/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json index ca3ff25e802..4fa10b042fa 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -78,9 +78,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -190,9 +190,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -386,9 +386,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -470,9 +470,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -498,9 +498,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -582,9 +582,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json b/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json index ac71a8e8157..db82378582b 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -540,9 +540,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -680,9 +680,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_bib.json b/extensions/vscode-colorize-tests/test/colorize-results/test_bib.json index 3913908ff54..05b234780ac 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_bib.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_bib.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -792,9 +792,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_c.json b/extensions/vscode-colorize-tests/test/colorize-results/test_c.json index 2abe20e8149..fbbf86a1c70 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_c.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_c.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -106,9 +106,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -120,9 +120,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -148,9 +148,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -190,9 +190,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -204,9 +204,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -232,9 +232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -260,9 +260,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -274,9 +274,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -708,9 +708,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -722,9 +722,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -820,9 +820,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -834,9 +834,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json index edc7db81c65..19e19cec621 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -36,9 +36,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -148,9 +148,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -554,9 +554,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -568,9 +568,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -582,9 +582,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -778,9 +778,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -792,9 +792,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -848,9 +848,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.scope-resolution: #4EC9B0", - "dark_plus_experimental": "entity.name.scope-resolution: #4EC9B0", + "dark_modern": "entity.name.scope-resolution: #4EC9B0", "hc_light": "entity.name.scope-resolution: #185E73", - "light_plus_experimental": "entity.name.scope-resolution: #267F99" + "light_modern": "entity.name.scope-resolution: #267F99" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "keyword.operator.new: #569CD6", "light_vs": "keyword.operator.new: #0000FF", "hc_black": "source.cpp keyword.operator.new: #C586C0", - "dark_plus_experimental": "source.cpp keyword.operator.new: #C586C0", + "dark_modern": "source.cpp keyword.operator.new: #C586C0", "hc_light": "source.cpp keyword.operator.new: #B5200D", - "light_plus_experimental": "source.cpp keyword.operator.new: #AF00DB" + "light_modern": "source.cpp keyword.operator.new: #AF00DB" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "meta.embedded.assembly: #CE9178", "light_vs": "meta.embedded.assembly: #A31515", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded.assembly: #CE9178", + "dark_modern": "meta.embedded.assembly: #CE9178", "hc_light": "meta.embedded.assembly: #0F4A85", - "light_plus_experimental": "meta.embedded.assembly: #A31515" + "light_modern": "meta.embedded.assembly: #A31515" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json b/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json index 76b6aa9f573..23597c44358 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -974,9 +974,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -988,9 +988,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "storage: #569CD6", "light_vs": "storage: #0000FF", "hc_black": "storage: #569CD6", - "dark_plus_experimental": "storage: #569CD6", + "dark_modern": "storage: #569CD6", "hc_light": "storage: #0F4A85", - "light_plus_experimental": "storage: #0000FF" + "light_modern": "storage: #0000FF" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_code-snippets.json b/extensions/vscode-colorize-tests/test/colorize-results/test_code-snippets.json new file mode 100644 index 00000000000..5403d20a7d8 --- /dev/null +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_code-snippets.json @@ -0,0 +1,3460 @@ +[ + { + "c": "{", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets punctuation.definition.dictionary.begin.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "//", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js punctuation.definition.comment.json.comments.snippets", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": " Each snippet is defined under a snippet name and has a scope, prefix, body and", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "//", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js punctuation.definition.comment.json.comments.snippets", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": " description. The scope defines in watch languages the snippet is applicable. The prefix is what is", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "//", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js punctuation.definition.comment.json.comments.snippets", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": " used to trigger the snippet and the body will be expanded and inserted.Possible variables are:", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "//", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js punctuation.definition.comment.json.comments.snippets", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": " $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "//", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js punctuation.definition.comment.json.comments.snippets", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": " Placeholders with the same ids are connected.", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "//", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js punctuation.definition.comment.json.comments.snippets", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": " Example:", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets comment.line.double-slash.js", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "dark_modern": "comment: #6A9955", + "hc_light": "comment: #515151", + "light_modern": "comment: #008000" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "MSFT Copyright Header", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "{", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets punctuation.definition.dictionary.begin.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "scope", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "javascript,typescript,css", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "prefix", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "[", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.definition.array.begin.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "header", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.separator.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "stub", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.separator.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "copyright", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "]", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.definition.array.end.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "body", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "[", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.definition.array.begin.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "/*---------------------------------------------------------------------------------------------", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.separator.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": " * Copyright (c) Microsoft Corporation. All rights reserved.", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.separator.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": " * Licensed under the MIT License. See License.txt in the project root for license information.", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.separator.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": " *--------------------------------------------------------------------------------------------*/", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.separator.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.separator.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "$", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets punctuation.section.insertion.dollar.simple.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.dollar.simple.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "0", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets variable.other.normal.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.variable.other.normal.numeric.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "]", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.definition.array.end.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "description", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "Insert Copyright Statement", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "}", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets punctuation.definition.dictionary.end.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "TS -> Inject Service", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "{", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets punctuation.definition.dictionary.begin.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "scope", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "typescript", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "description", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "Constructor Injection Pattern", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "prefix", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "@inject", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "body", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "@", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "$", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets punctuation.section.insertion.dollar.simple.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.dollar.simple.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "1", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets variable.other.normal.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.variable.other.normal.numeric.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": " private readonly _", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "$", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets punctuation.section.insertion.dollar.simple.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.dollar.simple.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "2", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets variable.other.normal.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.variable.other.normal.numeric.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": ": ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "$", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.brackets.json.comments.snippets meta.insertion.tabstop.bracket.json.comments.snippets punctuation.section.insertion.dollar.brackets.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.dollar.brackets.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "{", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.brackets.json.comments.snippets meta.insertion.tabstop.bracket.json.comments.snippets punctuation.section.insertion.bracket.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.bracket.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "1", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.brackets.json.comments.snippets meta.insertion.tabstop.bracket.json.comments.snippets variable.other.normal.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.variable.other.normal.numeric.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "}", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.brackets.json.comments.snippets meta.insertion.tabstop.bracket.json.comments.snippets punctuation.section.insertion.bracket.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.bracket.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "$", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets punctuation.section.insertion.dollar.simple.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.dollar.simple.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "0", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets variable.other.normal.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.variable.other.normal.numeric.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "}", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets punctuation.definition.dictionary.end.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "TS -> Event & Emitter", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "{", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets punctuation.definition.dictionary.begin.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "scope", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "typescript", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "prefix", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "emitter", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "description", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.end.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "Add emitter and event properties", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "body", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets string.json.comments.snippets support.type.property-name.json.comments.snippets punctuation.support.type.property-name.begin.json.comments.snippets", + "r": { + "dark_plus": "support.type.property-name: #9CDCFE", + "light_plus": "support.type.property-name.json: #0451A5", + "dark_vs": "support.type.property-name: #9CDCFE", + "light_vs": "support.type.property-name.json: #0451A5", + "hc_black": "support.type.property-name: #D4D4D4", + "dark_modern": "support.type.property-name: #9CDCFE", + "hc_light": "support.type.property-name.json: #0451A5", + "light_modern": "support.type.property-name.json: #0451A5" + } + }, + { + "c": ":", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.key-value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "[", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.definition.array.begin.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "private readonly _onDid", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "$", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets punctuation.section.insertion.dollar.simple.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.dollar.simple.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "1", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets variable.other.normal.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.variable.other.normal.numeric.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": " = new Emitter<", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "$", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets punctuation.section.insertion.dollar.simple.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.dollar.simple.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "2", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets variable.other.normal.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.variable.other.normal.numeric.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": ">();", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.separator.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.begin.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "readonly onDid", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "$", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets punctuation.section.insertion.dollar.simple.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.dollar.simple.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "1", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets variable.other.normal.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.variable.other.normal.numeric.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": ": Event<", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "$", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets punctuation.section.insertion.dollar.simple.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.dollar.simple.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "2", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets variable.other.normal.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.variable.other.normal.numeric.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "> = this._onDid", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "$", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets punctuation.section.insertion.dollar.simple.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.punctuation.section.insertion.dollar.simple.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": "1", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets meta.insertion.simple.numeric.json.comments.snippets meta.insertion.tabstop.simple.json.comments.snippets variable.other.normal.json.comments.snippets keyword.operator.insertion.json.comments.snippets custom.variable.other.normal.numeric.json.comments.snippets", + "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", + "dark_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" + } + }, + { + "c": ".event;", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets meta.any.json.comments.snippets string.quoted.double.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\"", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets string.quoted.double.json.comments.snippets punctuation.definition.string.end.json.comments.snippets", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" + } + }, + { + "c": "\t\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "]", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.array.json.comments.snippets punctuation.definition.array.end.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": ",", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets punctuation.separator.dictionary.pair.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "\t", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "}", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets meta.structure.dictionary.value.json.comments.snippets meta.structure.dictionary.json.comments.snippets punctuation.definition.dictionary.end.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "}", + "t": "source.json.comments.snippets meta.structure.dictionary.json.comments.snippets punctuation.definition.dictionary.end.json.comments.snippets", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + } +] \ No newline at end of file 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 44754d67572..52efa92c373 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json @@ -8,9 +8,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -22,9 +22,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -36,9 +36,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -50,9 +50,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -246,9 +246,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -386,9 +386,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -400,9 +400,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -414,9 +414,9 @@ "dark_vs": "source.coffee.embedded: #9CDCFE", "light_vs": "source.coffee.embedded: #E50000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -428,9 +428,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -456,9 +456,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.other.inherited-class: #4EC9B0", - "dark_plus_experimental": "entity.other.inherited-class: #4EC9B0", + "dark_modern": "entity.other.inherited-class: #4EC9B0", "hc_light": "entity.other.inherited-class: #185E73", - "light_plus_experimental": "entity.other.inherited-class: #267F99" + "light_modern": "entity.other.inherited-class: #267F99" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -582,9 +582,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -722,9 +722,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -736,9 +736,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -750,9 +750,9 @@ "dark_vs": "source.coffee.embedded: #9CDCFE", "light_vs": "source.coffee.embedded: #E50000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -764,9 +764,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -778,9 +778,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "keyword.operator.new: #569CD6", "light_vs": "keyword.operator.new: #0000FF", "hc_black": "keyword.operator.new: #569CD6", - "dark_plus_experimental": "keyword.operator.new: #569CD6", + "dark_modern": "keyword.operator.new: #569CD6", "hc_light": "keyword.operator.new: #0F4A85", - "light_plus_experimental": "keyword.operator.new: #0000FF" + "light_modern": "keyword.operator.new: #0000FF" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -918,9 +918,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -932,9 +932,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -946,9 +946,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "keyword.operator.new: #569CD6", "light_vs": "keyword.operator.new: #0000FF", "hc_black": "keyword.operator.new: #569CD6", - "dark_plus_experimental": "keyword.operator.new: #569CD6", + "dark_modern": "keyword.operator.new: #569CD6", "hc_light": "keyword.operator.new: #0F4A85", - "light_plus_experimental": "keyword.operator.new: #0000FF" + "light_modern": "keyword.operator.new: #0000FF" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178", + "dark_modern": "punctuation.definition.group.regexp: #CE9178", "hc_light": "punctuation.definition.group.regexp: #D16969", - "light_plus_experimental": "punctuation.definition.group.regexp: #D16969" + "light_modern": "punctuation.definition.group.regexp: #D16969" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.character-class.regexp: #D16969", + "dark_modern": "constant.character.character-class.regexp: #D16969", "hc_light": "constant.character.character-class.regexp: #811F3F", - "light_plus_experimental": "constant.character.character-class.regexp: #811F3F" + "light_modern": "constant.character.character-class.regexp: #811F3F" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator.quantifier.regexp: #D7BA7D", + "dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D", "hc_light": "keyword.operator.quantifier.regexp: #000000", - "light_plus_experimental": "keyword.operator.quantifier.regexp: #000000" + "light_modern": "keyword.operator.quantifier.regexp: #000000" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178", + "dark_modern": "punctuation.definition.group.regexp: #CE9178", "hc_light": "punctuation.definition.group.regexp: #D16969", - "light_plus_experimental": "punctuation.definition.group.regexp: #D16969" + "light_modern": "punctuation.definition.group.regexp: #D16969" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178", + "dark_modern": "punctuation.definition.group.regexp: #CE9178", "hc_light": "punctuation.definition.group.regexp: #D16969", - "light_plus_experimental": "punctuation.definition.group.regexp: #D16969" + "light_modern": "punctuation.definition.group.regexp: #D16969" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.character-class.regexp: #D16969", + "dark_modern": "constant.character.character-class.regexp: #D16969", "hc_light": "constant.character.character-class.regexp: #811F3F", - "light_plus_experimental": "constant.character.character-class.regexp: #811F3F" + "light_modern": "constant.character.character-class.regexp: #811F3F" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator.quantifier.regexp: #D7BA7D", + "dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D", "hc_light": "keyword.operator.quantifier.regexp: #000000", - "light_plus_experimental": "keyword.operator.quantifier.regexp: #000000" + "light_modern": "keyword.operator.quantifier.regexp: #000000" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "punctuation.definition.group.regexp: #CE9178", + "dark_modern": "punctuation.definition.group.regexp: #CE9178", "hc_light": "punctuation.definition.group.regexp: #D16969", - "light_plus_experimental": "punctuation.definition.group.regexp: #D16969" + "light_modern": "punctuation.definition.group.regexp: #D16969" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control.anchor.regexp: #DCDCAA", + "dark_modern": "keyword.control.anchor.regexp: #DCDCAA", "hc_light": "keyword.control.anchor.regexp: #EE0000", - "light_plus_experimental": "keyword.control.anchor.regexp: #EE0000" + "light_modern": "keyword.control.anchor.regexp: #EE0000" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json index 8e8c4af6701..652cc4824eb 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -50,9 +50,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -64,9 +64,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword.other.using: #C586C0", - "dark_plus_experimental": "keyword.other.using: #C586C0", + "dark_modern": "keyword.other.using: #C586C0", "hc_light": "keyword.other.using: #B5200D", - "light_plus_experimental": "keyword.other.using: #AF00DB" + "light_modern": "keyword.other.using: #AF00DB" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.namespace: #4EC9B0", - "dark_plus_experimental": "entity.name.namespace: #4EC9B0", + "dark_modern": "entity.name.namespace: #4EC9B0", "hc_light": "entity.name.namespace: #185E73", - "light_plus_experimental": "entity.name.namespace: #267F99" + "light_modern": "entity.name.namespace: #267F99" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -218,9 +218,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -232,9 +232,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -246,9 +246,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -260,9 +260,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -274,9 +274,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -288,9 +288,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -302,9 +302,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -316,9 +316,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -330,9 +330,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -344,9 +344,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.scope-resolution: #4EC9B0", - "dark_plus_experimental": "entity.name.scope-resolution: #4EC9B0", + "dark_modern": "entity.name.scope-resolution: #4EC9B0", "hc_light": "entity.name.scope-resolution: #185E73", - "light_plus_experimental": "entity.name.scope-resolution: #267F99" + "light_modern": "entity.name.scope-resolution: #267F99" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword.other.operator: #C586C0", - "dark_plus_experimental": "keyword.other.operator: #C586C0", + "dark_modern": "keyword.other.operator: #C586C0", "hc_light": "keyword.other.operator: #B5200D", - "light_plus_experimental": "keyword.other.operator: #AF00DB" + "light_modern": "keyword.other.operator: #AF00DB" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.operator.custom-literal: #DCDCAA", + "dark_modern": "entity.name.operator.custom-literal: #DCDCAA", "hc_light": "entity.name.operator.custom-literal: #5E2CBC", - "light_plus_experimental": "entity.name.operator.custom-literal: #795E26" + "light_modern": "entity.name.operator.custom-literal: #795E26" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.operator.custom-literal: #DCDCAA", + "dark_modern": "entity.name.operator.custom-literal: #DCDCAA", "hc_light": "entity.name.operator.custom-literal: #5E2CBC", - "light_plus_experimental": "entity.name.operator.custom-literal: #795E26" + "light_modern": "entity.name.operator.custom-literal: #795E26" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "meta.embedded.assembly: #CE9178", "light_vs": "meta.embedded.assembly: #A31515", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded.assembly: #CE9178", + "dark_modern": "meta.embedded.assembly: #CE9178", "hc_light": "meta.embedded.assembly: #0F4A85", - "light_plus_experimental": "meta.embedded.assembly: #A31515" + "light_modern": "meta.embedded.assembly: #A31515" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.scope-resolution: #4EC9B0", - "dark_plus_experimental": "entity.name.scope-resolution: #4EC9B0", + "dark_modern": "entity.name.scope-resolution: #4EC9B0", "hc_light": "entity.name.scope-resolution: #185E73", - "light_plus_experimental": "entity.name.scope-resolution: #267F99" + "light_modern": "entity.name.scope-resolution: #267F99" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json index 7ec3ae1752c..34a6e9e8654 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json @@ -8,9 +8,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword.other.using: #C586C0", - "dark_plus_experimental": "keyword.other.using: #C586C0", + "dark_modern": "keyword.other.using: #C586C0", "hc_light": "keyword.other.using: #B5200D", - "light_plus_experimental": "keyword.other.using: #AF00DB" + "light_modern": "keyword.other.using: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.variable: #9CDCFE", + "dark_modern": "entity.name.variable: #9CDCFE", "hc_light": "entity.name.variable: #001080", - "light_plus_experimental": "entity.name.variable: #001080" + "light_modern": "entity.name.variable: #001080" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.variable: #9CDCFE", + "dark_modern": "entity.name.variable: #9CDCFE", "hc_light": "entity.name.variable: #001080", - "light_plus_experimental": "entity.name.variable: #001080" + "light_modern": "entity.name.variable: #001080" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.variable: #9CDCFE", + "dark_modern": "entity.name.variable: #9CDCFE", "hc_light": "entity.name.variable: #001080", - "light_plus_experimental": "entity.name.variable: #001080" + "light_modern": "entity.name.variable: #001080" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -932,9 +932,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -946,9 +946,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.variable: #9CDCFE", + "dark_modern": "entity.name.variable: #9CDCFE", "hc_light": "entity.name.variable: #001080", - "light_plus_experimental": "entity.name.variable: #001080" + "light_modern": "entity.name.variable: #001080" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.variable: #9CDCFE", + "dark_modern": "entity.name.variable: #9CDCFE", "hc_light": "entity.name.variable: #001080", - "light_plus_experimental": "entity.name.variable: #001080" + "light_modern": "entity.name.variable: #001080" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.variable: #9CDCFE", + "dark_modern": "entity.name.variable: #9CDCFE", "hc_light": "entity.name.variable: #001080", - "light_plus_experimental": "entity.name.variable: #001080" + "light_modern": "entity.name.variable: #001080" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.variable: #9CDCFE", + "dark_modern": "entity.name.variable: #9CDCFE", "hc_light": "entity.name.variable: #001080", - "light_plus_experimental": "entity.name.variable: #001080" + "light_modern": "entity.name.variable: #001080" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file 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 f5cfc6d729e..5945550fd4e 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.variable: #9CDCFE", + "dark_modern": "entity.name.variable: #9CDCFE", "hc_light": "entity.name.variable: #001080", - "light_plus_experimental": "entity.name.variable: #001080" + "light_modern": "entity.name.variable: #001080" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.variable: #9CDCFE", + "dark_modern": "entity.name.variable: #9CDCFE", "hc_light": "entity.name.variable: #001080", - "light_plus_experimental": "entity.name.variable: #001080" + "light_modern": "entity.name.variable: #001080" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -274,9 +274,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -344,9 +344,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -386,9 +386,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.variable: #9CDCFE", + "dark_modern": "entity.name.variable: #9CDCFE", "hc_light": "entity.name.variable: #001080", - "light_plus_experimental": "entity.name.variable: #001080" + "light_modern": "entity.name.variable: #001080" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -694,9 +694,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -708,9 +708,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "entity.name.variable: #9CDCFE", + "dark_modern": "entity.name.variable: #9CDCFE", "hc_light": "entity.name.variable: #001080", - "light_plus_experimental": "entity.name.variable: #001080" + "light_modern": "entity.name.variable: #001080" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -890,9 +890,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -904,9 +904,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -974,9 +974,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4474,9 +4474,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4488,9 +4488,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4502,9 +4502,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4516,9 +4516,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4530,9 +4530,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ 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 1749314b071..78a5ca00d07 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_css.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -316,9 +316,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -358,9 +358,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -372,9 +372,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -414,9 +414,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -484,9 +484,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -554,9 +554,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -624,9 +624,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -638,9 +638,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "invalid: #F44747", "light_vs": "invalid: #CD3131", "hc_black": "invalid: #F44747", - "dark_plus_experimental": "invalid: #F44747", + "dark_modern": "invalid: #F44747", "hc_light": "invalid: #B5200D", - "light_plus_experimental": "invalid: #CD3131" + "light_modern": "invalid: #CD3131" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "invalid: #F44747", "light_vs": "invalid: #CD3131", "hc_black": "invalid: #F44747", - "dark_plus_experimental": "invalid: #F44747", + "dark_modern": "invalid: #F44747", "hc_light": "invalid: #B5200D", - "light_plus_experimental": "invalid: #CD3131" + "light_modern": "invalid: #CD3131" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.font-name: #0451A5", "hc_black": "support.constant.font-name: #CE9178", - "dark_plus_experimental": "support.constant.font-name: #CE9178", + "dark_modern": "support.constant.font-name: #CE9178", "hc_light": "support.constant.font-name: #0451A5", - "light_plus_experimental": "support.constant.font-name: #0451A5" + "light_modern": "support.constant.font-name: #0451A5" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.font-name: #0451A5", "hc_black": "support.constant.font-name: #CE9178", - "dark_plus_experimental": "support.constant.font-name: #CE9178", + "dark_modern": "support.constant.font-name: #CE9178", "hc_light": "support.constant.font-name: #0451A5", - "light_plus_experimental": "support.constant.font-name: #0451A5" + "light_modern": "support.constant.font-name: #0451A5" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "invalid: #F44747", "light_vs": "invalid: #CD3131", "hc_black": "invalid: #F44747", - "dark_plus_experimental": "invalid: #F44747", + "dark_modern": "invalid: #F44747", "hc_light": "invalid: #B5200D", - "light_plus_experimental": "invalid: #CD3131" + "light_modern": "invalid: #CD3131" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "invalid: #F44747", "light_vs": "invalid: #CD3131", "hc_black": "invalid: #F44747", - "dark_plus_experimental": "invalid: #F44747", + "dark_modern": "invalid: #F44747", "hc_light": "invalid: #B5200D", - "light_plus_experimental": "invalid: #CD3131" + "light_modern": "invalid: #CD3131" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "invalid: #F44747", "light_vs": "invalid: #CD3131", "hc_black": "invalid: #F44747", - "dark_plus_experimental": "invalid: #F44747", + "dark_modern": "invalid: #F44747", "hc_light": "invalid: #B5200D", - "light_plus_experimental": "invalid: #CD3131" + "light_modern": "invalid: #CD3131" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.font-name: #0451A5", "hc_black": "support.constant.font-name: #CE9178", - "dark_plus_experimental": "support.constant.font-name: #CE9178", + "dark_modern": "support.constant.font-name: #CE9178", "hc_light": "support.constant.font-name: #0451A5", - "light_plus_experimental": "support.constant.font-name: #0451A5" + "light_modern": "support.constant.font-name: #0451A5" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.font-name: #0451A5", "hc_black": "support.constant.font-name: #CE9178", - "dark_plus_experimental": "support.constant.font-name: #CE9178", + "dark_modern": "support.constant.font-name: #CE9178", "hc_light": "support.constant.font-name: #0451A5", - "light_plus_experimental": "support.constant.font-name: #0451A5" + "light_modern": "support.constant.font-name: #0451A5" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -4474,9 +4474,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4488,9 +4488,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4502,9 +4502,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -4516,9 +4516,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -4530,9 +4530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4544,9 +4544,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4558,9 +4558,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4572,9 +4572,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -4586,9 +4586,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4600,9 +4600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4614,9 +4614,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -4628,9 +4628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4642,9 +4642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4656,9 +4656,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -4670,9 +4670,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4684,9 +4684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4698,9 +4698,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -4712,9 +4712,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -4726,9 +4726,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4740,9 +4740,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4754,9 +4754,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4768,9 +4768,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4782,9 +4782,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4796,9 +4796,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4810,9 +4810,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -4824,9 +4824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4838,9 +4838,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4852,9 +4852,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -4866,9 +4866,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4880,9 +4880,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4894,9 +4894,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4908,9 +4908,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4922,9 +4922,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4936,9 +4936,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -4950,9 +4950,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -4964,9 +4964,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4978,9 +4978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4992,9 +4992,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5006,9 +5006,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -5020,9 +5020,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5034,9 +5034,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5048,9 +5048,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -5062,9 +5062,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5076,9 +5076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5090,9 +5090,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5104,9 +5104,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5118,9 +5118,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -5132,9 +5132,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5146,9 +5146,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -5160,9 +5160,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5174,9 +5174,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -5188,9 +5188,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5202,9 +5202,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5216,9 +5216,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -5230,9 +5230,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5244,9 +5244,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5258,9 +5258,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5272,9 +5272,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5286,9 +5286,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5300,9 +5300,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -5314,9 +5314,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5328,9 +5328,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5342,9 +5342,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5356,9 +5356,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5370,9 +5370,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -5384,9 +5384,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5398,9 +5398,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5412,9 +5412,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -5426,9 +5426,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5440,9 +5440,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5454,9 +5454,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5468,9 +5468,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5482,9 +5482,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5496,9 +5496,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -5510,9 +5510,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5524,9 +5524,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5538,9 +5538,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -5552,9 +5552,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5566,9 +5566,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5580,9 +5580,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -5594,9 +5594,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -5608,9 +5608,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5622,9 +5622,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5636,9 +5636,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5650,9 +5650,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -5664,9 +5664,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5678,9 +5678,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5692,9 +5692,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5706,9 +5706,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -5720,9 +5720,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5734,9 +5734,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5748,9 +5748,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -5762,9 +5762,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5776,9 +5776,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5790,9 +5790,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5804,9 +5804,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -5818,9 +5818,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5832,9 +5832,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5846,9 +5846,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -5860,9 +5860,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5874,9 +5874,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -5888,9 +5888,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5902,9 +5902,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5916,9 +5916,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5930,9 +5930,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -5944,9 +5944,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5958,9 +5958,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5972,9 +5972,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -5986,9 +5986,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6000,9 +6000,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -6014,9 +6014,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6028,9 +6028,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6042,9 +6042,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6056,9 +6056,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6070,9 +6070,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -6084,9 +6084,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6098,9 +6098,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -6112,9 +6112,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6126,9 +6126,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -6140,9 +6140,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6154,9 +6154,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6168,9 +6168,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -6182,9 +6182,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6196,9 +6196,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6210,9 +6210,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6224,9 +6224,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -6238,9 +6238,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6252,9 +6252,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6266,9 +6266,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -6280,9 +6280,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6294,9 +6294,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6308,9 +6308,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -6322,9 +6322,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6336,9 +6336,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6350,9 +6350,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -6364,9 +6364,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6378,9 +6378,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6392,9 +6392,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6406,9 +6406,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -6420,9 +6420,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6434,9 +6434,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6448,9 +6448,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -6462,9 +6462,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6476,9 +6476,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6490,9 +6490,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6504,9 +6504,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -6518,9 +6518,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6532,9 +6532,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6546,9 +6546,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -6560,9 +6560,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6574,9 +6574,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6588,9 +6588,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -6602,9 +6602,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6616,9 +6616,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6630,9 +6630,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -6644,9 +6644,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6658,9 +6658,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6672,9 +6672,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6686,9 +6686,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -6700,9 +6700,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6714,9 +6714,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6728,9 +6728,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -6742,9 +6742,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6756,9 +6756,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6770,9 +6770,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -6784,9 +6784,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6798,9 +6798,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6812,9 +6812,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -6826,9 +6826,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6840,9 +6840,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6854,9 +6854,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -6868,9 +6868,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6882,9 +6882,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6896,9 +6896,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -6910,9 +6910,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6924,9 +6924,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6938,9 +6938,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6952,9 +6952,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -6966,9 +6966,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6980,9 +6980,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6994,9 +6994,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7008,9 +7008,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -7022,9 +7022,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7036,9 +7036,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7050,9 +7050,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -7064,9 +7064,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7078,9 +7078,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7092,9 +7092,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7106,9 +7106,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -7120,9 +7120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7134,9 +7134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7148,9 +7148,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -7162,9 +7162,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -7176,9 +7176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7190,9 +7190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7204,9 +7204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7218,9 +7218,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -7232,9 +7232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7246,9 +7246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7260,9 +7260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -7274,9 +7274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7288,9 +7288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7302,9 +7302,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -7316,9 +7316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7330,9 +7330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7344,9 +7344,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7358,9 +7358,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -7372,9 +7372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7386,9 +7386,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7400,9 +7400,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -7414,9 +7414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7428,9 +7428,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7442,9 +7442,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -7456,9 +7456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7470,9 +7470,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7484,9 +7484,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -7498,9 +7498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7512,9 +7512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7526,9 +7526,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -7540,9 +7540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7554,9 +7554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7568,9 +7568,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7582,9 +7582,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -7596,9 +7596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7610,9 +7610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7624,9 +7624,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -7638,9 +7638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7652,9 +7652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7666,9 +7666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -7680,9 +7680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7694,9 +7694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7708,9 +7708,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -7722,9 +7722,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -7736,9 +7736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7750,9 +7750,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -7764,9 +7764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7778,9 +7778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7792,9 +7792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7806,9 +7806,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -7820,9 +7820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7834,9 +7834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7848,9 +7848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -7862,9 +7862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7876,9 +7876,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7890,9 +7890,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -7904,9 +7904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7918,9 +7918,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7932,9 +7932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7946,9 +7946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.font-name: #0451A5", "hc_black": "support.constant.font-name: #CE9178", - "dark_plus_experimental": "support.constant.font-name: #CE9178", + "dark_modern": "support.constant.font-name: #CE9178", "hc_light": "support.constant.font-name: #0451A5", - "light_plus_experimental": "support.constant.font-name: #0451A5" + "light_modern": "support.constant.font-name: #0451A5" } }, { @@ -7960,9 +7960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7974,9 +7974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7988,9 +7988,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -8002,9 +8002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8016,9 +8016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8030,9 +8030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -8044,9 +8044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8058,9 +8058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8072,9 +8072,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -8086,9 +8086,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -8100,9 +8100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8114,9 +8114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8128,9 +8128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8142,9 +8142,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -8156,9 +8156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8170,9 +8170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8184,9 +8184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -8198,9 +8198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8212,9 +8212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8226,9 +8226,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -8240,9 +8240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8254,9 +8254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8268,9 +8268,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8282,9 +8282,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -8296,9 +8296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8310,9 +8310,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8324,9 +8324,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -8338,9 +8338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8352,9 +8352,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8366,9 +8366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8380,9 +8380,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8394,9 +8394,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -8408,9 +8408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8422,9 +8422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8436,9 +8436,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -8450,9 +8450,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -8464,9 +8464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8478,9 +8478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8492,9 +8492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8506,9 +8506,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -8520,9 +8520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8534,9 +8534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8548,9 +8548,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8562,9 +8562,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -8576,9 +8576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8590,9 +8590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8604,9 +8604,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -8618,9 +8618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8632,9 +8632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8646,9 +8646,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8660,9 +8660,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -8674,9 +8674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8688,9 +8688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8702,9 +8702,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -8716,9 +8716,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -8730,9 +8730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8744,9 +8744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8758,9 +8758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8772,9 +8772,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -8786,9 +8786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8800,9 +8800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8814,9 +8814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -8828,9 +8828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8842,9 +8842,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -8856,9 +8856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8870,9 +8870,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -8884,9 +8884,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -8898,9 +8898,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -8912,9 +8912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8926,9 +8926,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -8940,9 +8940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8954,9 +8954,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -8968,9 +8968,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -8982,9 +8982,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -8996,9 +8996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9010,9 +9010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9024,9 +9024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9038,9 +9038,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9052,9 +9052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9066,9 +9066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9080,9 +9080,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9094,9 +9094,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -9108,9 +9108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9122,9 +9122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9136,9 +9136,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9150,9 +9150,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9164,9 +9164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9178,9 +9178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9192,9 +9192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9206,9 +9206,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9220,9 +9220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9234,9 +9234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9248,9 +9248,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9262,9 +9262,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -9276,9 +9276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9290,9 +9290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9304,9 +9304,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9318,9 +9318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9332,9 +9332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9346,9 +9346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -9360,9 +9360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9374,9 +9374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9388,9 +9388,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9402,9 +9402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9416,9 +9416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9430,9 +9430,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9444,9 +9444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9458,9 +9458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9472,9 +9472,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9486,9 +9486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9500,9 +9500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9514,9 +9514,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9528,9 +9528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9542,9 +9542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9556,9 +9556,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9570,9 +9570,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9584,9 +9584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9598,9 +9598,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9612,9 +9612,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9626,9 +9626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9640,9 +9640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9654,9 +9654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9668,9 +9668,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9682,9 +9682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9696,9 +9696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9710,9 +9710,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9724,9 +9724,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -9738,9 +9738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9752,9 +9752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.font-name: #0451A5", "hc_black": "support.constant.font-name: #CE9178", - "dark_plus_experimental": "support.constant.font-name: #CE9178", + "dark_modern": "support.constant.font-name: #CE9178", "hc_light": "support.constant.font-name: #0451A5", - "light_plus_experimental": "support.constant.font-name: #0451A5" + "light_modern": "support.constant.font-name: #0451A5" } }, { @@ -9766,9 +9766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9780,9 +9780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9794,9 +9794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.font-name: #0451A5", "hc_black": "support.constant.font-name: #CE9178", - "dark_plus_experimental": "support.constant.font-name: #CE9178", + "dark_modern": "support.constant.font-name: #CE9178", "hc_light": "support.constant.font-name: #0451A5", - "light_plus_experimental": "support.constant.font-name: #0451A5" + "light_modern": "support.constant.font-name: #0451A5" } }, { @@ -9808,9 +9808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9822,9 +9822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9836,9 +9836,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9850,9 +9850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9864,9 +9864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9878,9 +9878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -9892,9 +9892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9906,9 +9906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -9920,9 +9920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9934,9 +9934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9948,9 +9948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9962,9 +9962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9976,9 +9976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -9990,9 +9990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10004,9 +10004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -10018,9 +10018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10032,9 +10032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -10046,9 +10046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10060,9 +10060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10074,9 +10074,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -10088,9 +10088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10102,9 +10102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10116,9 +10116,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10130,9 +10130,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -10144,9 +10144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10158,9 +10158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10172,9 +10172,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -10186,9 +10186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10200,9 +10200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10214,9 +10214,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10228,9 +10228,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -10242,9 +10242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10256,9 +10256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10270,9 +10270,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -10284,9 +10284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10298,9 +10298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10312,9 +10312,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10326,9 +10326,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -10340,9 +10340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10354,9 +10354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10368,9 +10368,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -10382,9 +10382,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -10396,9 +10396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10410,9 +10410,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -10424,9 +10424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10438,9 +10438,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -10452,9 +10452,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -10466,9 +10466,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -10480,9 +10480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10494,9 +10494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10508,9 +10508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10522,9 +10522,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -10536,9 +10536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10550,9 +10550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10564,9 +10564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -10578,9 +10578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -10592,9 +10592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10606,9 +10606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10620,9 +10620,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -10634,9 +10634,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -10648,9 +10648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10662,9 +10662,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -10676,9 +10676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10690,9 +10690,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -10704,9 +10704,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -10718,9 +10718,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -10732,9 +10732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10746,9 +10746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10760,9 +10760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10774,9 +10774,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -10788,9 +10788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10802,9 +10802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10816,9 +10816,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10830,9 +10830,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10844,9 +10844,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10858,9 +10858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10872,9 +10872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10886,9 +10886,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -10900,9 +10900,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -10914,9 +10914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10928,9 +10928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10942,9 +10942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10956,9 +10956,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -10970,9 +10970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10984,9 +10984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10998,9 +10998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -11012,9 +11012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11026,9 +11026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -11040,9 +11040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11054,9 +11054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11068,9 +11068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11082,9 +11082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11096,9 +11096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -11110,9 +11110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11124,9 +11124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -11138,9 +11138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11152,9 +11152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -11166,9 +11166,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11180,9 +11180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11194,9 +11194,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -11208,9 +11208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11222,9 +11222,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11236,9 +11236,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -11250,9 +11250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11264,9 +11264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11278,9 +11278,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -11292,9 +11292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11306,9 +11306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11320,9 +11320,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11334,9 +11334,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -11348,9 +11348,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11362,9 +11362,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11376,9 +11376,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -11390,9 +11390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11404,9 +11404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11418,9 +11418,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11432,9 +11432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11446,9 +11446,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11460,9 +11460,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -11474,9 +11474,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11488,9 +11488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11502,9 +11502,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11516,9 +11516,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -11530,9 +11530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11544,9 +11544,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11558,9 +11558,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -11572,9 +11572,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11586,9 +11586,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11600,9 +11600,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11614,9 +11614,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -11628,9 +11628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11642,9 +11642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json index 77eeae823b0..e926933337e 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -36,9 +36,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -64,9 +64,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -92,9 +92,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -106,9 +106,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -120,9 +120,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -148,9 +148,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -190,9 +190,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -204,9 +204,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -232,9 +232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -260,9 +260,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -274,9 +274,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -288,9 +288,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -302,9 +302,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -316,9 +316,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -330,9 +330,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -344,9 +344,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -358,9 +358,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -372,9 +372,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -386,9 +386,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -400,9 +400,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -414,9 +414,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -428,9 +428,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -456,9 +456,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -470,9 +470,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -484,9 +484,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -498,9 +498,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -512,9 +512,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -526,9 +526,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -540,9 +540,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -554,9 +554,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -568,9 +568,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -582,9 +582,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -596,9 +596,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -610,9 +610,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -624,9 +624,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -638,9 +638,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -666,9 +666,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -680,9 +680,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -694,9 +694,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -708,9 +708,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -722,9 +722,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -736,9 +736,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -750,9 +750,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -764,9 +764,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -778,9 +778,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -806,9 +806,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -820,9 +820,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -834,9 +834,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -848,9 +848,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -862,9 +862,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -876,9 +876,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -890,9 +890,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -918,9 +918,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -932,9 +932,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -946,9 +946,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -960,9 +960,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -974,9 +974,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -988,9 +988,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "entity.name.function.preprocessor: #569CD6", "light_vs": "entity.name.function.preprocessor: #0000FF", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function.preprocessor: #569CD6", + "dark_modern": "entity.name.function.preprocessor: #569CD6", "hc_light": "entity.name.function.preprocessor: #0F4A85", - "light_plus_experimental": "entity.name.function.preprocessor: #0000FF" + "light_modern": "entity.name.function.preprocessor: #0000FF" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "keyword.operator.sizeof: #569CD6", "light_vs": "keyword.operator.sizeof: #0000FF", "hc_black": "keyword.operator.sizeof: #569CD6", - "dark_plus_experimental": "keyword.operator.sizeof: #569CD6", + "dark_modern": "keyword.operator.sizeof: #569CD6", "hc_light": "keyword.operator.sizeof: #0F4A85", - "light_plus_experimental": "keyword.operator.sizeof: #0000FF" + "light_modern": "keyword.operator.sizeof: #0000FF" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "keyword.operator.sizeof: #569CD6", "light_vs": "keyword.operator.sizeof: #0000FF", "hc_black": "keyword.operator.sizeof: #569CD6", - "dark_plus_experimental": "keyword.operator.sizeof: #569CD6", + "dark_modern": "keyword.operator.sizeof: #569CD6", "hc_light": "keyword.operator.sizeof: #0F4A85", - "light_plus_experimental": "keyword.operator.sizeof: #0000FF" + "light_modern": "keyword.operator.sizeof: #0000FF" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4474,9 +4474,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4488,9 +4488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4502,9 +4502,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4516,9 +4516,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4530,9 +4530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4544,9 +4544,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4558,9 +4558,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4572,9 +4572,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4586,9 +4586,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4600,9 +4600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4614,9 +4614,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4628,9 +4628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4642,9 +4642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4656,9 +4656,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4670,9 +4670,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4684,9 +4684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4698,9 +4698,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4712,9 +4712,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4726,9 +4726,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4740,9 +4740,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -4754,9 +4754,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4768,9 +4768,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4782,9 +4782,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4796,9 +4796,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -4810,9 +4810,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4824,9 +4824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -4838,9 +4838,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -4852,9 +4852,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4866,9 +4866,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4880,9 +4880,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4894,9 +4894,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4908,9 +4908,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4922,9 +4922,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4936,9 +4936,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -4950,9 +4950,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4964,9 +4964,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4978,9 +4978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4992,9 +4992,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5006,9 +5006,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5020,9 +5020,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5034,9 +5034,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5048,9 +5048,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5062,9 +5062,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5076,9 +5076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5090,9 +5090,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5104,9 +5104,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5118,9 +5118,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5132,9 +5132,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5146,9 +5146,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5160,9 +5160,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5174,9 +5174,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5188,9 +5188,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5202,9 +5202,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5216,9 +5216,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5230,9 +5230,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5244,9 +5244,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5258,9 +5258,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5272,9 +5272,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5286,9 +5286,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5300,9 +5300,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5314,9 +5314,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5328,9 +5328,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5342,9 +5342,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5356,9 +5356,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5370,9 +5370,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5384,9 +5384,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5398,9 +5398,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5412,9 +5412,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5426,9 +5426,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5440,9 +5440,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5454,9 +5454,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5468,9 +5468,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5482,9 +5482,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5496,9 +5496,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5510,9 +5510,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5524,9 +5524,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5538,9 +5538,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5552,9 +5552,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5566,9 +5566,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5580,9 +5580,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5594,9 +5594,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5608,9 +5608,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5622,9 +5622,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5636,9 +5636,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5650,9 +5650,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5664,9 +5664,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5678,9 +5678,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5692,9 +5692,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5706,9 +5706,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5720,9 +5720,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5734,9 +5734,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5748,9 +5748,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5762,9 +5762,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5776,9 +5776,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5790,9 +5790,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5804,9 +5804,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -5818,9 +5818,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5832,9 +5832,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5846,9 +5846,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5860,9 +5860,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5874,9 +5874,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5888,9 +5888,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5902,9 +5902,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5916,9 +5916,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5930,9 +5930,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5944,9 +5944,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5958,9 +5958,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -5972,9 +5972,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5986,9 +5986,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6000,9 +6000,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6014,9 +6014,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6028,9 +6028,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6042,9 +6042,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6056,9 +6056,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6070,9 +6070,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6084,9 +6084,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6098,9 +6098,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6112,9 +6112,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6126,9 +6126,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6140,9 +6140,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6154,9 +6154,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6168,9 +6168,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6182,9 +6182,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6196,9 +6196,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6210,9 +6210,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6224,9 +6224,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6238,9 +6238,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6252,9 +6252,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6266,9 +6266,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6280,9 +6280,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6294,9 +6294,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6308,9 +6308,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6322,9 +6322,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6336,9 +6336,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6350,9 +6350,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6364,9 +6364,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6378,9 +6378,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6392,9 +6392,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6406,9 +6406,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6420,9 +6420,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6434,9 +6434,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6448,9 +6448,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6462,9 +6462,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6476,9 +6476,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6490,9 +6490,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6504,9 +6504,9 @@ "dark_vs": "keyword.operator.sizeof: #569CD6", "light_vs": "keyword.operator.sizeof: #0000FF", "hc_black": "keyword.operator.sizeof: #569CD6", - "dark_plus_experimental": "keyword.operator.sizeof: #569CD6", + "dark_modern": "keyword.operator.sizeof: #569CD6", "hc_light": "keyword.operator.sizeof: #0F4A85", - "light_plus_experimental": "keyword.operator.sizeof: #0000FF" + "light_modern": "keyword.operator.sizeof: #0000FF" } }, { @@ -6518,9 +6518,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6532,9 +6532,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6546,9 +6546,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6560,9 +6560,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6574,9 +6574,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6588,9 +6588,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6602,9 +6602,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6616,9 +6616,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6630,9 +6630,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6644,9 +6644,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6658,9 +6658,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6672,9 +6672,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6686,9 +6686,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6700,9 +6700,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6714,9 +6714,9 @@ "dark_vs": "keyword.operator.cast: #569CD6", "light_vs": "keyword.operator.cast: #0000FF", "hc_black": "keyword.operator.cast: #569CD6", - "dark_plus_experimental": "keyword.operator.cast: #569CD6", + "dark_modern": "keyword.operator.cast: #569CD6", "hc_light": "keyword.operator.cast: #0F4A85", - "light_plus_experimental": "keyword.operator.cast: #0000FF" + "light_modern": "keyword.operator.cast: #0000FF" } }, { @@ -6728,9 +6728,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6742,9 +6742,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6756,9 +6756,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6770,9 +6770,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6784,9 +6784,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6798,9 +6798,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6812,9 +6812,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6826,9 +6826,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6840,9 +6840,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6854,9 +6854,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6868,9 +6868,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6882,9 +6882,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6896,9 +6896,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6910,9 +6910,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6924,9 +6924,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6938,9 +6938,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6952,9 +6952,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6966,9 +6966,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6980,9 +6980,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6994,9 +6994,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7008,9 +7008,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7022,9 +7022,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7036,9 +7036,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7050,9 +7050,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7064,9 +7064,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7078,9 +7078,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7092,9 +7092,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7106,9 +7106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -7120,9 +7120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7134,9 +7134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7148,9 +7148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7162,9 +7162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7176,9 +7176,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7190,9 +7190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7204,9 +7204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7218,9 +7218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7232,9 +7232,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -7246,9 +7246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7260,9 +7260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7274,9 +7274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7288,9 +7288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7302,9 +7302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7316,9 +7316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7330,9 +7330,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -7344,9 +7344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7358,9 +7358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7372,9 +7372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7386,9 +7386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7400,9 +7400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7414,9 +7414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7428,9 +7428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7442,9 +7442,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7456,9 +7456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7470,9 +7470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7484,9 +7484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7498,9 +7498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7512,9 +7512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7526,9 +7526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7540,9 +7540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7554,9 +7554,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7568,9 +7568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7582,9 +7582,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7596,9 +7596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7610,9 +7610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7624,9 +7624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7638,9 +7638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7652,9 +7652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7666,9 +7666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7680,9 +7680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7694,9 +7694,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7708,9 +7708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7722,9 +7722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7736,9 +7736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7750,9 +7750,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7764,9 +7764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7778,9 +7778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7792,9 +7792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7806,9 +7806,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -7820,9 +7820,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7834,9 +7834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7848,9 +7848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7862,9 +7862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7876,9 +7876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7890,9 +7890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7904,9 +7904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7918,9 +7918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7932,9 +7932,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7946,9 +7946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7960,9 +7960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7974,9 +7974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7988,9 +7988,9 @@ "dark_vs": "keyword.operator.sizeof: #569CD6", "light_vs": "keyword.operator.sizeof: #0000FF", "hc_black": "keyword.operator.sizeof: #569CD6", - "dark_plus_experimental": "keyword.operator.sizeof: #569CD6", + "dark_modern": "keyword.operator.sizeof: #569CD6", "hc_light": "keyword.operator.sizeof: #0F4A85", - "light_plus_experimental": "keyword.operator.sizeof: #0000FF" + "light_modern": "keyword.operator.sizeof: #0000FF" } }, { @@ -8002,9 +8002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8016,9 +8016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8030,9 +8030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8044,9 +8044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8058,9 +8058,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8072,9 +8072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8086,9 +8086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8100,9 +8100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8114,9 +8114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8128,9 +8128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -8142,9 +8142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8156,9 +8156,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8170,9 +8170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8184,9 +8184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8198,9 +8198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8212,9 +8212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8226,9 +8226,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8240,9 +8240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8254,9 +8254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8268,9 +8268,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -8282,9 +8282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8296,9 +8296,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8310,9 +8310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8324,9 +8324,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8338,9 +8338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8352,9 +8352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8366,9 +8366,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8380,9 +8380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8394,9 +8394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8408,9 +8408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8422,9 +8422,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8436,9 +8436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8450,9 +8450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8464,9 +8464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8478,9 +8478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8492,9 +8492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8506,9 +8506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8520,9 +8520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8534,9 +8534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8548,9 +8548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8562,9 +8562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8576,9 +8576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8590,9 +8590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8604,9 +8604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8618,9 +8618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8632,9 +8632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8646,9 +8646,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8660,9 +8660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8674,9 +8674,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8688,9 +8688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8702,9 +8702,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8716,9 +8716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8730,9 +8730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8744,9 +8744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8758,9 +8758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8772,9 +8772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8786,9 +8786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8800,9 +8800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8814,9 +8814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8828,9 +8828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8842,9 +8842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8856,9 +8856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8870,9 +8870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8884,9 +8884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8898,9 +8898,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8912,9 +8912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8926,9 +8926,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8940,9 +8940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8954,9 +8954,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8968,9 +8968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8982,9 +8982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8996,9 +8996,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -9010,9 +9010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9024,9 +9024,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -9038,9 +9038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9052,9 +9052,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9066,9 +9066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9080,9 +9080,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9094,9 +9094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9108,9 +9108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9122,9 +9122,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9136,9 +9136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9150,9 +9150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -9164,9 +9164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9178,9 +9178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9192,9 +9192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9206,9 +9206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9220,9 +9220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9234,9 +9234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9248,9 +9248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9262,9 +9262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9276,9 +9276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9290,9 +9290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9304,9 +9304,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9318,9 +9318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9332,9 +9332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9346,9 +9346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9360,9 +9360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9374,9 +9374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9388,9 +9388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9402,9 +9402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9416,9 +9416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9430,9 +9430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9444,9 +9444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9458,9 +9458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9472,9 +9472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9486,9 +9486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9500,9 +9500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9514,9 +9514,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9528,9 +9528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9542,9 +9542,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9556,9 +9556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9570,9 +9570,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9584,9 +9584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9598,9 +9598,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9612,9 +9612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9626,9 +9626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9640,9 +9640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9654,9 +9654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9668,9 +9668,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -9682,9 +9682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9696,9 +9696,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -9710,9 +9710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9724,9 +9724,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9738,9 +9738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9752,9 +9752,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9766,9 +9766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9780,9 +9780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9794,9 +9794,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9808,9 +9808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9822,9 +9822,9 @@ "dark_vs": "keyword.operator.sizeof: #569CD6", "light_vs": "keyword.operator.sizeof: #0000FF", "hc_black": "keyword.operator.sizeof: #569CD6", - "dark_plus_experimental": "keyword.operator.sizeof: #569CD6", + "dark_modern": "keyword.operator.sizeof: #569CD6", "hc_light": "keyword.operator.sizeof: #0F4A85", - "light_plus_experimental": "keyword.operator.sizeof: #0000FF" + "light_modern": "keyword.operator.sizeof: #0000FF" } }, { @@ -9836,9 +9836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9850,9 +9850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9864,9 +9864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9878,9 +9878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9892,9 +9892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9906,9 +9906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9920,9 +9920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9934,9 +9934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9948,9 +9948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9962,9 +9962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9976,9 +9976,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9990,9 +9990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10004,9 +10004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10018,9 +10018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10032,9 +10032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10046,9 +10046,9 @@ "dark_vs": "keyword.operator.cast: #569CD6", "light_vs": "keyword.operator.cast: #0000FF", "hc_black": "keyword.operator.cast: #569CD6", - "dark_plus_experimental": "keyword.operator.cast: #569CD6", + "dark_modern": "keyword.operator.cast: #569CD6", "hc_light": "keyword.operator.cast: #0F4A85", - "light_plus_experimental": "keyword.operator.cast: #0000FF" + "light_modern": "keyword.operator.cast: #0000FF" } }, { @@ -10060,9 +10060,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10074,9 +10074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10088,9 +10088,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10102,9 +10102,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10116,9 +10116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10130,9 +10130,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10144,9 +10144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10158,9 +10158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10172,9 +10172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10186,9 +10186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10200,9 +10200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10214,9 +10214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10228,9 +10228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10242,9 +10242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10256,9 +10256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10270,9 +10270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10284,9 +10284,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10298,9 +10298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10312,9 +10312,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10326,9 +10326,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10340,9 +10340,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10354,9 +10354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10368,9 +10368,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10382,9 +10382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10396,9 +10396,9 @@ "dark_vs": "keyword.operator.cast: #569CD6", "light_vs": "keyword.operator.cast: #0000FF", "hc_black": "keyword.operator.cast: #569CD6", - "dark_plus_experimental": "keyword.operator.cast: #569CD6", + "dark_modern": "keyword.operator.cast: #569CD6", "hc_light": "keyword.operator.cast: #0F4A85", - "light_plus_experimental": "keyword.operator.cast: #0000FF" + "light_modern": "keyword.operator.cast: #0000FF" } }, { @@ -10410,9 +10410,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10424,9 +10424,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -10438,9 +10438,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10452,9 +10452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10466,9 +10466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10480,9 +10480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10494,9 +10494,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10508,9 +10508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10522,9 +10522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10536,9 +10536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10550,9 +10550,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10564,9 +10564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10578,9 +10578,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10592,9 +10592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10606,9 +10606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10620,9 +10620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10634,9 +10634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10648,9 +10648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10662,9 +10662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10676,9 +10676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10690,9 +10690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10704,9 +10704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10718,9 +10718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10732,9 +10732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10746,9 +10746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10760,9 +10760,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10774,9 +10774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10788,9 +10788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10802,9 +10802,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10816,9 +10816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10830,9 +10830,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10844,9 +10844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10858,9 +10858,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10872,9 +10872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10886,9 +10886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10900,9 +10900,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10914,9 +10914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10928,9 +10928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10942,9 +10942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10956,9 +10956,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10970,9 +10970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10984,9 +10984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10998,9 +10998,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11012,9 +11012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11026,9 +11026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11040,9 +11040,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11054,9 +11054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11068,9 +11068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11082,9 +11082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11096,9 +11096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11110,9 +11110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11124,9 +11124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11138,9 +11138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11152,9 +11152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11166,9 +11166,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11180,9 +11180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11194,9 +11194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11208,9 +11208,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11222,9 +11222,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11236,9 +11236,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11250,9 +11250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11264,9 +11264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11278,9 +11278,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11292,9 +11292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11306,9 +11306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11320,9 +11320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11334,9 +11334,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11348,9 +11348,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11362,9 +11362,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11376,9 +11376,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11390,9 +11390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11404,9 +11404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11418,9 +11418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11432,9 +11432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11446,9 +11446,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11460,9 +11460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11474,9 +11474,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11488,9 +11488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11502,9 +11502,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11516,9 +11516,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11530,9 +11530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11544,9 +11544,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11558,9 +11558,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11572,9 +11572,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11586,9 +11586,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11600,9 +11600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11614,9 +11614,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11628,9 +11628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11642,9 +11642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -11656,9 +11656,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11670,9 +11670,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -11684,9 +11684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11698,9 +11698,9 @@ "dark_vs": "keyword.operator.cast: #569CD6", "light_vs": "keyword.operator.cast: #0000FF", "hc_black": "keyword.operator.cast: #569CD6", - "dark_plus_experimental": "keyword.operator.cast: #569CD6", + "dark_modern": "keyword.operator.cast: #569CD6", "hc_light": "keyword.operator.cast: #0F4A85", - "light_plus_experimental": "keyword.operator.cast: #0000FF" + "light_modern": "keyword.operator.cast: #0000FF" } }, { @@ -11712,9 +11712,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11726,9 +11726,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -11740,9 +11740,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11754,9 +11754,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11768,9 +11768,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11782,9 +11782,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11796,9 +11796,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11810,9 +11810,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11824,9 +11824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11838,9 +11838,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11852,9 +11852,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11866,9 +11866,9 @@ "dark_vs": "keyword.operator.sizeof: #569CD6", "light_vs": "keyword.operator.sizeof: #0000FF", "hc_black": "keyword.operator.sizeof: #569CD6", - "dark_plus_experimental": "keyword.operator.sizeof: #569CD6", + "dark_modern": "keyword.operator.sizeof: #569CD6", "hc_light": "keyword.operator.sizeof: #0F4A85", - "light_plus_experimental": "keyword.operator.sizeof: #0000FF" + "light_modern": "keyword.operator.sizeof: #0000FF" } }, { @@ -11880,9 +11880,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11894,9 +11894,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -11908,9 +11908,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11922,9 +11922,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11936,9 +11936,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11950,9 +11950,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11964,9 +11964,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11978,9 +11978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11992,9 +11992,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12006,9 +12006,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -12020,9 +12020,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12034,9 +12034,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12048,9 +12048,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12062,9 +12062,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12076,9 +12076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12090,9 +12090,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12104,9 +12104,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12118,9 +12118,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12132,9 +12132,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -12146,9 +12146,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12160,9 +12160,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12174,9 +12174,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12188,9 +12188,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12202,9 +12202,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12216,9 +12216,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12230,9 +12230,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12244,9 +12244,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12258,9 +12258,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12272,9 +12272,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12286,9 +12286,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12300,9 +12300,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12314,9 +12314,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12328,9 +12328,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12342,9 +12342,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12356,9 +12356,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12370,9 +12370,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12384,9 +12384,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12398,9 +12398,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12412,9 +12412,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12426,9 +12426,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12440,9 +12440,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -12454,9 +12454,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12468,9 +12468,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -12482,9 +12482,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12496,9 +12496,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12510,9 +12510,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12524,9 +12524,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12538,9 +12538,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12552,9 +12552,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12566,9 +12566,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -12580,9 +12580,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12594,9 +12594,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12608,9 +12608,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12622,9 +12622,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12636,9 +12636,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12650,9 +12650,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12664,9 +12664,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12678,9 +12678,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12692,9 +12692,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12706,9 +12706,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12720,9 +12720,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12734,9 +12734,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -12748,9 +12748,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12762,9 +12762,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12776,9 +12776,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12790,9 +12790,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12804,9 +12804,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12818,9 +12818,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12832,9 +12832,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12846,9 +12846,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12860,9 +12860,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12874,9 +12874,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12888,9 +12888,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12902,9 +12902,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12916,9 +12916,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -12930,9 +12930,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12944,9 +12944,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12958,9 +12958,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12972,9 +12972,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12986,9 +12986,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13000,9 +13000,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13014,9 +13014,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13028,9 +13028,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13042,9 +13042,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13056,9 +13056,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13070,9 +13070,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13084,9 +13084,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13098,9 +13098,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13112,9 +13112,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13126,9 +13126,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13140,9 +13140,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13154,9 +13154,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13168,9 +13168,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13182,9 +13182,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13196,9 +13196,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13210,9 +13210,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -13224,9 +13224,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13238,9 +13238,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13252,9 +13252,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13266,9 +13266,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13280,9 +13280,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13294,9 +13294,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13308,9 +13308,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13322,9 +13322,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13336,9 +13336,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13350,9 +13350,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13364,9 +13364,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13378,9 +13378,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13392,9 +13392,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13406,9 +13406,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13420,9 +13420,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13434,9 +13434,9 @@ "dark_vs": "keyword.operator.sizeof: #569CD6", "light_vs": "keyword.operator.sizeof: #0000FF", "hc_black": "keyword.operator.sizeof: #569CD6", - "dark_plus_experimental": "keyword.operator.sizeof: #569CD6", + "dark_modern": "keyword.operator.sizeof: #569CD6", "hc_light": "keyword.operator.sizeof: #0F4A85", - "light_plus_experimental": "keyword.operator.sizeof: #0000FF" + "light_modern": "keyword.operator.sizeof: #0000FF" } }, { @@ -13448,9 +13448,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13462,9 +13462,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13476,9 +13476,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13490,9 +13490,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13504,9 +13504,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13518,9 +13518,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13532,9 +13532,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13546,9 +13546,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13560,9 +13560,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13574,9 +13574,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13588,9 +13588,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13602,9 +13602,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13616,9 +13616,9 @@ "dark_vs": "keyword.operator.sizeof: #569CD6", "light_vs": "keyword.operator.sizeof: #0000FF", "hc_black": "keyword.operator.sizeof: #569CD6", - "dark_plus_experimental": "keyword.operator.sizeof: #569CD6", + "dark_modern": "keyword.operator.sizeof: #569CD6", "hc_light": "keyword.operator.sizeof: #0F4A85", - "light_plus_experimental": "keyword.operator.sizeof: #0000FF" + "light_modern": "keyword.operator.sizeof: #0000FF" } }, { @@ -13630,9 +13630,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13644,9 +13644,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13658,9 +13658,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13672,9 +13672,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13686,9 +13686,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13700,9 +13700,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13714,9 +13714,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13728,9 +13728,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13742,9 +13742,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13756,9 +13756,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13770,9 +13770,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13784,9 +13784,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13798,9 +13798,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13812,9 +13812,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13826,9 +13826,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13840,9 +13840,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13854,9 +13854,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13868,9 +13868,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13882,9 +13882,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13896,9 +13896,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -13910,9 +13910,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13924,9 +13924,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13938,9 +13938,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -13952,9 +13952,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13966,9 +13966,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13980,9 +13980,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13994,9 +13994,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -14008,9 +14008,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14022,9 +14022,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14036,9 +14036,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -14050,9 +14050,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14064,9 +14064,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14078,9 +14078,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14092,9 +14092,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -14106,9 +14106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14120,9 +14120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14134,9 +14134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14148,9 +14148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14162,9 +14162,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -14176,9 +14176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14190,9 +14190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14204,9 +14204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14218,9 +14218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14232,9 +14232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14246,9 +14246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14260,9 +14260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14274,9 +14274,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -14288,9 +14288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14302,9 +14302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14316,9 +14316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14330,9 +14330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14344,9 +14344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -14358,9 +14358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14372,9 +14372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14386,9 +14386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14400,9 +14400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14414,9 +14414,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -14428,9 +14428,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -14442,9 +14442,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -14456,9 +14456,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -14470,9 +14470,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -14484,9 +14484,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -14498,9 +14498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -14512,9 +14512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -14526,9 +14526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -14540,9 +14540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14554,9 +14554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14568,9 +14568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14582,9 +14582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14596,9 +14596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14610,9 +14610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14624,9 +14624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14638,9 +14638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14652,9 +14652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14666,9 +14666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14680,9 +14680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14694,9 +14694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14708,9 +14708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14722,9 +14722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -14736,9 +14736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14750,9 +14750,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -14764,9 +14764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14778,9 +14778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14792,9 +14792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14806,9 +14806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14820,9 +14820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14834,9 +14834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14848,9 +14848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14862,9 +14862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -14876,9 +14876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14890,9 +14890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -14904,9 +14904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14918,9 +14918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14932,9 +14932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14946,9 +14946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14960,9 +14960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14974,9 +14974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -14988,9 +14988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15002,9 +15002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -15016,9 +15016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15030,9 +15030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15044,9 +15044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15058,9 +15058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15072,9 +15072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15086,9 +15086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -15100,9 +15100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15114,9 +15114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15128,9 +15128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15142,9 +15142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15156,9 +15156,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -15170,9 +15170,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -15184,9 +15184,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -15198,9 +15198,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -15212,9 +15212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15226,9 +15226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15240,9 +15240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15254,9 +15254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -15268,9 +15268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15282,9 +15282,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -15296,9 +15296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15310,9 +15310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15324,9 +15324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json b/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json index b44a0e74abf..dc43f74e3c8 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_diff.json b/extensions/vscode-colorize-tests/test/colorize-results/test_diff.json index b88ea4c7665..238ca7a5d02 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_diff.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_diff.json @@ -8,9 +8,9 @@ "dark_vs": "meta.diff.header: #569CD6", "light_vs": "meta.diff.header: #000080", "hc_black": "meta.diff.header: #000080", - "dark_plus_experimental": "meta.diff.header: #569CD6", + "dark_modern": "meta.diff.header: #569CD6", "hc_light": "meta.diff.header: #062F4A", - "light_plus_experimental": "meta.diff.header: #000080" + "light_modern": "meta.diff.header: #000080" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "meta.diff.header: #569CD6", "light_vs": "meta.diff.header: #000080", "hc_black": "meta.diff.header: #000080", - "dark_plus_experimental": "meta.diff.header: #569CD6", + "dark_modern": "meta.diff.header: #569CD6", "hc_light": "meta.diff.header: #062F4A", - "light_plus_experimental": "meta.diff.header: #000080" + "light_modern": "meta.diff.header: #000080" } }, { @@ -50,9 +50,9 @@ "dark_vs": "meta.diff.header: #569CD6", "light_vs": "meta.diff.header: #000080", "hc_black": "meta.diff.header: #000080", - "dark_plus_experimental": "meta.diff.header: #569CD6", + "dark_modern": "meta.diff.header: #569CD6", "hc_light": "meta.diff.header: #062F4A", - "light_plus_experimental": "meta.diff.header: #000080" + "light_modern": "meta.diff.header: #000080" } }, { @@ -64,9 +64,9 @@ "dark_vs": "meta.diff.header: #569CD6", "light_vs": "meta.diff.header: #000080", "hc_black": "meta.diff.header: #000080", - "dark_plus_experimental": "meta.diff.header: #569CD6", + "dark_modern": "meta.diff.header: #569CD6", "hc_light": "meta.diff.header: #062F4A", - "light_plus_experimental": "meta.diff.header: #000080" + "light_modern": "meta.diff.header: #000080" } }, { @@ -78,9 +78,9 @@ "dark_vs": "meta.diff.header: #569CD6", "light_vs": "meta.diff.header: #000080", "hc_black": "meta.diff.header: #000080", - "dark_plus_experimental": "meta.diff.header: #569CD6", + "dark_modern": "meta.diff.header: #569CD6", "hc_light": "meta.diff.header: #062F4A", - "light_plus_experimental": "meta.diff.header: #000080" + "light_modern": "meta.diff.header: #000080" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "markup.deleted: #CE9178", "light_vs": "markup.deleted: #A31515", "hc_black": "markup.deleted: #CE9178", - "dark_plus_experimental": "markup.deleted: #CE9178", + "dark_modern": "markup.deleted: #CE9178", "hc_light": "markup.deleted: #5A5A5A", - "light_plus_experimental": "markup.deleted: #A31515" + "light_modern": "markup.deleted: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "markup.deleted: #CE9178", "light_vs": "markup.deleted: #A31515", "hc_black": "markup.deleted: #CE9178", - "dark_plus_experimental": "markup.deleted: #CE9178", + "dark_modern": "markup.deleted: #CE9178", "hc_light": "markup.deleted: #5A5A5A", - "light_plus_experimental": "markup.deleted: #A31515" + "light_modern": "markup.deleted: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "markup.inserted: #B5CEA8", "light_vs": "markup.inserted: #098658", "hc_black": "markup.inserted: #B5CEA8", - "dark_plus_experimental": "markup.inserted: #B5CEA8", + "dark_modern": "markup.inserted: #B5CEA8", "hc_light": "markup.inserted: #096D48", - "light_plus_experimental": "markup.inserted: #098658" + "light_modern": "markup.inserted: #098658" } }, { @@ -204,9 +204,9 @@ "dark_vs": "markup.inserted: #B5CEA8", "light_vs": "markup.inserted: #098658", "hc_black": "markup.inserted: #B5CEA8", - "dark_plus_experimental": "markup.inserted: #B5CEA8", + "dark_modern": "markup.inserted: #B5CEA8", "hc_light": "markup.inserted: #096D48", - "light_plus_experimental": "markup.inserted: #098658" + "light_modern": "markup.inserted: #098658" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json index 42443910bc6..078717226a7 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -78,9 +78,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -106,9 +106,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -204,9 +204,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -302,23 +302,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "=", - "t": "source.fsharp binding.fsharp keyword.fsharp", + "t": "source.fsharp binding.fsharp keyword.symbol.fsharp", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,23 +344,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "new", - "t": "source.fsharp keyword.symbol.new", + "t": "source.fsharp keyword.fsharp", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -372,9 +372,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -554,9 +554,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -624,23 +624,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "=", - "t": "source.fsharp binding.fsharp keyword.fsharp", + "t": "source.fsharp binding.fsharp keyword.symbol.fsharp", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -778,23 +778,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "()", - "t": "source.fsharp binding.fsharp constant.language.unit.fsharp", + "t": "source.fsharp binding.fsharp keyword.symbol.fsharp", "r": { - "dark_plus": "constant.language: #569CD6", - "light_plus": "constant.language: #0000FF", - "dark_vs": "constant.language: #569CD6", - "light_vs": "constant.language: #0000FF", - "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", - "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "dark_plus": "keyword: #569CD6", + "light_plus": "keyword: #0000FF", + "dark_vs": "keyword: #569CD6", + "light_vs": "keyword: #0000FF", + "hc_black": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", + "hc_light": "keyword: #0F4A85", + "light_modern": "keyword: #0000FF" } }, { @@ -806,23 +806,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "=", - "t": "source.fsharp binding.fsharp keyword.fsharp", + "t": "source.fsharp binding.fsharp keyword.symbol.fsharp", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -904,9 +904,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -932,9 +932,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -946,23 +946,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "=", - "t": "source.fsharp binding.fsharp keyword.fsharp", + "t": "source.fsharp binding.fsharp keyword.symbol.fsharp", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -974,23 +974,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "<-", - "t": "source.fsharp keyword.symbol.fsharp", + "t": "source.fsharp keyword.symbol.arrow.fsharp", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1072,23 +1072,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { "c": "()", - "t": "source.fsharp binding.fsharp constant.language.unit.fsharp", + "t": "source.fsharp binding.fsharp keyword.symbol.fsharp", "r": { - "dark_plus": "constant.language: #569CD6", - "light_plus": "constant.language: #0000FF", - "dark_vs": "constant.language: #569CD6", - "light_vs": "constant.language: #0000FF", - "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", - "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "dark_plus": "keyword: #569CD6", + "light_plus": "keyword: #0000FF", + "dark_vs": "keyword: #569CD6", + "light_vs": "keyword: #0000FF", + "hc_black": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", + "hc_light": "keyword: #0F4A85", + "light_modern": "keyword: #0000FF" } }, { @@ -1100,23 +1100,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "=", - "t": "source.fsharp binding.fsharp keyword.fsharp", + "t": "source.fsharp binding.fsharp keyword.symbol.fsharp", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1128,23 +1128,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "<-", - "t": "source.fsharp keyword.symbol.fsharp", + "t": "source.fsharp keyword.symbol.arrow.fsharp", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1268,23 +1268,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { "c": "=", - "t": "source.fsharp binding.fsharp keyword.fsharp", + "t": "source.fsharp binding.fsharp keyword.symbol.fsharp", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1394,23 +1394,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { "c": "()", - "t": "source.fsharp binding.fsharp constant.language.unit.fsharp", + "t": "source.fsharp binding.fsharp keyword.symbol.fsharp", "r": { - "dark_plus": "constant.language: #569CD6", - "light_plus": "constant.language: #0000FF", - "dark_vs": "constant.language: #569CD6", - "light_vs": "constant.language: #0000FF", - "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", - "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "dark_plus": "keyword: #569CD6", + "light_plus": "keyword: #0000FF", + "dark_vs": "keyword: #569CD6", + "light_vs": "keyword: #0000FF", + "hc_black": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", + "hc_light": "keyword: #0F4A85", + "light_modern": "keyword: #0000FF" } }, { @@ -1422,23 +1422,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "=", - "t": "source.fsharp binding.fsharp keyword.fsharp", + "t": "source.fsharp binding.fsharp keyword.symbol.fsharp", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character: #569CD6", + "dark_modern": "constant.character: #569CD6", "hc_light": "constant.character: #0F4A85", - "light_plus_experimental": "constant.character: #0000FF" + "light_modern": "constant.character: #0000FF" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_go.json b/extensions/vscode-colorize-tests/test/colorize-results/test_go.json index b097b1adbb7..5258e4f205c 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_go.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_go.json @@ -8,9 +8,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -120,9 +120,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -400,9 +400,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -414,9 +414,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type.numeric.go: #4EC9B0", + "dark_modern": "storage.type.numeric.go: #4EC9B0", "hc_light": "storage.type.numeric.go: #185E73", - "light_plus_experimental": "storage.type.numeric.go: #267F99" + "light_modern": "storage.type.numeric.go: #267F99" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -862,9 +862,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -876,9 +876,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -932,9 +932,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.placeholder: #9CDCFE", + "dark_modern": "constant.other.placeholder: #9CDCFE", "hc_light": "constant.other.placeholder: #001080", - "light_plus_experimental": "constant.other.placeholder: #001080" + "light_modern": "constant.other.placeholder: #001080" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json b/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json index 665fdede87c..2fb630ed130 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -106,9 +106,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -638,9 +638,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -652,9 +652,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -736,9 +736,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -750,9 +750,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -890,9 +890,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -918,9 +918,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -932,9 +932,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4474,9 +4474,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4488,9 +4488,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4502,9 +4502,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4516,9 +4516,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -4530,9 +4530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4544,9 +4544,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4558,9 +4558,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4572,9 +4572,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4586,9 +4586,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4600,9 +4600,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4614,9 +4614,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4628,9 +4628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4642,9 +4642,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4656,9 +4656,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4670,9 +4670,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4684,9 +4684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4698,9 +4698,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4712,9 +4712,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4726,9 +4726,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4740,9 +4740,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4754,9 +4754,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4768,9 +4768,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4782,9 +4782,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4796,9 +4796,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4810,9 +4810,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4824,9 +4824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -4838,9 +4838,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4852,9 +4852,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4866,9 +4866,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4880,9 +4880,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4894,9 +4894,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4908,9 +4908,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -4922,9 +4922,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4936,9 +4936,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -4950,9 +4950,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4964,9 +4964,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4978,9 +4978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4992,9 +4992,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5006,9 +5006,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5020,9 +5020,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5034,9 +5034,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -5048,9 +5048,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5062,9 +5062,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -5076,9 +5076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5090,9 +5090,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -5104,9 +5104,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5118,9 +5118,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5132,9 +5132,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5146,9 +5146,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -5160,9 +5160,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -5174,9 +5174,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -5188,9 +5188,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5202,9 +5202,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5216,9 +5216,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5230,9 +5230,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5244,9 +5244,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -5258,9 +5258,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5272,9 +5272,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -5286,9 +5286,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5300,9 +5300,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -5314,9 +5314,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5328,9 +5328,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.groovy: #4EC9B0", + "dark_modern": "storage.type.primitive.groovy: #4EC9B0", "hc_light": "storage.type.primitive.groovy: #185E73", - "light_plus_experimental": "storage.type.primitive.groovy: #267F99" + "light_modern": "storage.type.primitive.groovy: #267F99" } }, { @@ -5342,9 +5342,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5356,9 +5356,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -5370,9 +5370,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5384,9 +5384,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -5398,9 +5398,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5412,9 +5412,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5426,9 +5426,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5440,9 +5440,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5454,9 +5454,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5468,9 +5468,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -5482,9 +5482,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5496,9 +5496,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5510,9 +5510,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5524,9 +5524,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5538,9 +5538,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5552,9 +5552,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5566,9 +5566,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5580,9 +5580,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5594,9 +5594,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5608,9 +5608,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5622,9 +5622,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5636,9 +5636,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -5650,9 +5650,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5664,9 +5664,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5678,9 +5678,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5692,9 +5692,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5706,9 +5706,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5720,9 +5720,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5734,9 +5734,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5748,9 +5748,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5762,9 +5762,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -5776,9 +5776,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5790,9 +5790,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5804,9 +5804,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5818,9 +5818,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5832,9 +5832,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -5846,9 +5846,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5860,9 +5860,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5874,9 +5874,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5888,9 +5888,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5902,9 +5902,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5916,9 +5916,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -5930,9 +5930,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5944,9 +5944,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -5958,9 +5958,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -5972,9 +5972,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -5986,9 +5986,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6000,9 +6000,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6014,9 +6014,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6028,9 +6028,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6042,9 +6042,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6056,9 +6056,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6070,9 +6070,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6084,9 +6084,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6098,9 +6098,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6112,9 +6112,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -6126,9 +6126,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6140,9 +6140,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6154,9 +6154,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6168,9 +6168,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6182,9 +6182,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6196,9 +6196,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6210,9 +6210,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6224,9 +6224,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6238,9 +6238,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -6252,9 +6252,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6266,9 +6266,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6280,9 +6280,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6294,9 +6294,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6308,9 +6308,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6322,9 +6322,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6336,9 +6336,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6350,9 +6350,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6364,9 +6364,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6378,9 +6378,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -6392,9 +6392,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6406,9 +6406,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6420,9 +6420,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6434,9 +6434,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6448,9 +6448,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6462,9 +6462,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6476,9 +6476,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -6490,9 +6490,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6504,9 +6504,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6518,9 +6518,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6532,9 +6532,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6546,9 +6546,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6560,9 +6560,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6574,9 +6574,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6588,9 +6588,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6602,9 +6602,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6616,9 +6616,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6630,9 +6630,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6644,9 +6644,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6658,9 +6658,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6672,9 +6672,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6686,9 +6686,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6700,9 +6700,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6714,9 +6714,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6728,9 +6728,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6742,9 +6742,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6756,9 +6756,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6770,9 +6770,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6784,9 +6784,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6798,9 +6798,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6812,9 +6812,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6826,9 +6826,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6840,9 +6840,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6854,9 +6854,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6868,9 +6868,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6882,9 +6882,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6896,9 +6896,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6910,9 +6910,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6924,9 +6924,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6938,9 +6938,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6952,9 +6952,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6966,9 +6966,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6980,9 +6980,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6994,9 +6994,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7008,9 +7008,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7022,9 +7022,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7036,9 +7036,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7050,9 +7050,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7064,9 +7064,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7078,9 +7078,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7092,9 +7092,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7106,9 +7106,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7120,9 +7120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7134,9 +7134,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7148,9 +7148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7162,9 +7162,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7176,9 +7176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7190,9 +7190,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7204,9 +7204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7218,9 +7218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7232,9 +7232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7246,9 +7246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7260,9 +7260,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7274,9 +7274,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7288,9 +7288,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7302,9 +7302,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7316,9 +7316,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -7330,9 +7330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7344,9 +7344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -7358,9 +7358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7372,9 +7372,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7386,9 +7386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7400,9 +7400,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7414,9 +7414,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7428,9 +7428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7442,9 +7442,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7456,9 +7456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7470,9 +7470,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7484,9 +7484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7498,9 +7498,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7512,9 +7512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7526,9 +7526,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7540,9 +7540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7554,9 +7554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7568,9 +7568,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7582,9 +7582,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7596,9 +7596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7610,9 +7610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7624,9 +7624,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7638,9 +7638,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7652,9 +7652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7666,9 +7666,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7680,9 +7680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7694,9 +7694,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7708,9 +7708,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7722,9 +7722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7736,9 +7736,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7750,9 +7750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7764,9 +7764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7778,9 +7778,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7792,9 +7792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7806,9 +7806,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7820,9 +7820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7834,9 +7834,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7848,9 +7848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7862,9 +7862,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7876,9 +7876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7890,9 +7890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7904,9 +7904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7918,9 +7918,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7932,9 +7932,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7946,9 +7946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7960,9 +7960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7974,9 +7974,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7988,9 +7988,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8002,9 +8002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8016,9 +8016,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8030,9 +8030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8044,9 +8044,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8058,9 +8058,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8072,9 +8072,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8086,9 +8086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8100,9 +8100,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8114,9 +8114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8128,9 +8128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8142,9 +8142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8156,9 +8156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8170,9 +8170,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8184,9 +8184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8198,9 +8198,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8212,9 +8212,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8226,9 +8226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8240,9 +8240,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8254,9 +8254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8268,9 +8268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8282,9 +8282,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8296,9 +8296,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8310,9 +8310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8324,9 +8324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8338,9 +8338,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8352,9 +8352,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8366,9 +8366,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -8380,9 +8380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8394,9 +8394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -8408,9 +8408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8422,9 +8422,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8436,9 +8436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8450,9 +8450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8464,9 +8464,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8478,9 +8478,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8492,9 +8492,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8506,9 +8506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8520,9 +8520,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8534,9 +8534,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8548,9 +8548,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8562,9 +8562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8576,9 +8576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8590,9 +8590,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8604,9 +8604,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8618,9 +8618,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8632,9 +8632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8646,9 +8646,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8660,9 +8660,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8674,9 +8674,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8688,9 +8688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8702,9 +8702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8716,9 +8716,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8730,9 +8730,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8744,9 +8744,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8758,9 +8758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8772,9 +8772,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8786,9 +8786,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8800,9 +8800,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8814,9 +8814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8828,9 +8828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8842,9 +8842,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8856,9 +8856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8870,9 +8870,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8884,9 +8884,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8898,9 +8898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8912,9 +8912,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8926,9 +8926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8940,9 +8940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8954,9 +8954,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8968,9 +8968,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8982,9 +8982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8996,9 +8996,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9010,9 +9010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9024,9 +9024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9038,9 +9038,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -9052,9 +9052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9066,9 +9066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -9080,9 +9080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9094,9 +9094,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9108,9 +9108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9122,9 +9122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9136,9 +9136,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9150,9 +9150,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9164,9 +9164,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9178,9 +9178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9192,9 +9192,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9206,9 +9206,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9220,9 +9220,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9234,9 +9234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9248,9 +9248,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9262,9 +9262,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9276,9 +9276,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9290,9 +9290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9304,9 +9304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9318,9 +9318,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9332,9 +9332,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9346,9 +9346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9360,9 +9360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9374,9 +9374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9388,9 +9388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9402,9 +9402,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -9416,9 +9416,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -9430,9 +9430,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -9444,9 +9444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9458,9 +9458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -9472,9 +9472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9486,9 +9486,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9500,9 +9500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9514,9 +9514,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -9528,9 +9528,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9542,9 +9542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9556,9 +9556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9570,9 +9570,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9584,9 +9584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9598,9 +9598,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -9612,9 +9612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9626,9 +9626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -9640,9 +9640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9654,9 +9654,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9668,9 +9668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9682,9 +9682,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9696,9 +9696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9710,9 +9710,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -9724,9 +9724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9738,9 +9738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -9752,9 +9752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9766,9 +9766,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9780,9 +9780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9794,9 +9794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -9808,9 +9808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9822,9 +9822,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9836,9 +9836,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9850,9 +9850,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -9864,9 +9864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9878,9 +9878,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -9892,9 +9892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9906,9 +9906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -9920,9 +9920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9934,9 +9934,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9948,9 +9948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9962,9 +9962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9976,9 +9976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9990,9 +9990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10004,9 +10004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10018,9 +10018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10032,9 +10032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10046,9 +10046,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10060,9 +10060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10074,9 +10074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -10088,9 +10088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10102,9 +10102,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10116,9 +10116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10130,9 +10130,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10144,9 +10144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10158,9 +10158,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10172,9 +10172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10186,9 +10186,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10200,9 +10200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10214,9 +10214,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -10228,9 +10228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10242,9 +10242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -10256,9 +10256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10270,9 +10270,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10284,9 +10284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10298,9 +10298,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10312,9 +10312,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -10326,9 +10326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10340,9 +10340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -10354,9 +10354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10368,9 +10368,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10382,9 +10382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10396,9 +10396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10410,9 +10410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10424,9 +10424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10438,9 +10438,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10452,9 +10452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10466,9 +10466,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10480,9 +10480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10494,9 +10494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -10508,9 +10508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10522,9 +10522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10536,9 +10536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10550,9 +10550,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10564,9 +10564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10578,9 +10578,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -10592,9 +10592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10606,9 +10606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -10620,9 +10620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10634,9 +10634,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10648,9 +10648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10662,9 +10662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -10676,9 +10676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10690,9 +10690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10704,9 +10704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10718,9 +10718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10732,9 +10732,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10746,9 +10746,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10760,9 +10760,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10774,9 +10774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10788,9 +10788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10802,9 +10802,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -10816,9 +10816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10830,9 +10830,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.definition.variable.name: #9CDCFE", - "dark_plus_experimental": "meta.definition.variable.name: #9CDCFE", + "dark_modern": "meta.definition.variable.name: #9CDCFE", "hc_light": "meta.definition.variable.name: #001080", - "light_plus_experimental": "meta.definition.variable.name: #001080" + "light_modern": "meta.definition.variable.name: #001080" } }, { @@ -10844,9 +10844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10858,9 +10858,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10872,9 +10872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10886,9 +10886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10900,9 +10900,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10914,9 +10914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10928,9 +10928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10942,9 +10942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10956,9 +10956,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10970,9 +10970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10984,9 +10984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10998,9 +10998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11012,9 +11012,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11026,9 +11026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11040,9 +11040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11054,9 +11054,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -11068,9 +11068,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -11082,9 +11082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11096,9 +11096,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11110,9 +11110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11124,9 +11124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11138,9 +11138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11152,9 +11152,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11166,9 +11166,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11180,9 +11180,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11194,9 +11194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11208,9 +11208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11222,9 +11222,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11236,9 +11236,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -11250,9 +11250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11264,9 +11264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -11278,9 +11278,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11292,9 +11292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11306,9 +11306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11320,9 +11320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11334,9 +11334,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11348,9 +11348,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11362,9 +11362,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11376,9 +11376,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11390,9 +11390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11404,9 +11404,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -11418,9 +11418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11432,9 +11432,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11446,9 +11446,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11460,9 +11460,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -11474,9 +11474,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11488,9 +11488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11502,9 +11502,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11516,9 +11516,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11530,9 +11530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11544,9 +11544,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11558,9 +11558,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11572,9 +11572,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11586,9 +11586,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11600,9 +11600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11614,9 +11614,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11628,9 +11628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11642,9 +11642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -11656,9 +11656,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11670,9 +11670,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -11684,9 +11684,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -11698,9 +11698,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11712,9 +11712,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -11726,9 +11726,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11740,9 +11740,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -11754,9 +11754,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -11768,9 +11768,9 @@ "dark_vs": "source.groovy.embedded: #D4D4D4", "light_vs": "source.groovy.embedded: #000000", "hc_black": "source.groovy.embedded: #FFFFFF", - "dark_plus_experimental": "source.groovy.embedded: #D4D4D4", + "dark_modern": "source.groovy.embedded: #D4D4D4", "hc_light": "source.groovy.embedded: #292929", - "light_plus_experimental": "source.groovy.embedded: #000000" + "light_modern": "source.groovy.embedded: #000000" } }, { @@ -11782,9 +11782,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -11796,9 +11796,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -11810,9 +11810,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -11824,9 +11824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11838,9 +11838,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11852,9 +11852,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11866,9 +11866,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11880,9 +11880,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11894,9 +11894,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11908,9 +11908,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11922,9 +11922,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11936,9 +11936,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -11950,9 +11950,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -11964,9 +11964,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -11978,9 +11978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11992,9 +11992,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12006,9 +12006,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12020,9 +12020,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12034,9 +12034,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12048,9 +12048,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12062,9 +12062,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.annotation.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.annotation.groovy: #4EC9B0", + "dark_modern": "storage.type.annotation.groovy: #4EC9B0", "hc_light": "storage.type.annotation.groovy: #185E73", - "light_plus_experimental": "storage.type.annotation.groovy: #267F99" + "light_modern": "storage.type.annotation.groovy: #267F99" } }, { @@ -12076,9 +12076,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -12090,9 +12090,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12104,9 +12104,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -12118,9 +12118,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12132,9 +12132,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12146,9 +12146,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12160,9 +12160,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12174,9 +12174,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -12188,9 +12188,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12202,9 +12202,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12216,9 +12216,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12230,9 +12230,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -12244,9 +12244,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -12258,9 +12258,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -12272,9 +12272,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12286,9 +12286,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.object.array.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.object.array.groovy: #4EC9B0", + "dark_modern": "storage.type.object.array.groovy: #4EC9B0", "hc_light": "storage.type.object.array.groovy: #185E73", - "light_plus_experimental": "storage.type.object.array.groovy: #267F99" + "light_modern": "storage.type.object.array.groovy: #267F99" } }, { @@ -12300,9 +12300,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12314,9 +12314,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12328,9 +12328,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12342,9 +12342,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12356,9 +12356,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12370,9 +12370,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12384,9 +12384,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12398,9 +12398,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12412,9 +12412,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12426,9 +12426,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12440,9 +12440,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12454,9 +12454,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12468,9 +12468,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12482,9 +12482,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12496,9 +12496,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12510,9 +12510,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.groovy: #4EC9B0", + "dark_modern": "storage.type.groovy: #4EC9B0", "hc_light": "storage.type.groovy: #185E73", - "light_plus_experimental": "storage.type.groovy: #267F99" + "light_modern": "storage.type.groovy: #267F99" } }, { @@ -12524,9 +12524,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12538,9 +12538,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12552,9 +12552,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12566,9 +12566,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12580,9 +12580,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12594,9 +12594,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12608,9 +12608,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12622,9 +12622,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -12636,9 +12636,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12650,9 +12650,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -12664,9 +12664,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -12678,9 +12678,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -12692,9 +12692,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12706,9 +12706,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -12720,9 +12720,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -12734,9 +12734,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -12748,9 +12748,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12762,9 +12762,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12776,9 +12776,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12790,9 +12790,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12804,9 +12804,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12818,9 +12818,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12832,9 +12832,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.annotation.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.annotation.groovy: #4EC9B0", + "dark_modern": "storage.type.annotation.groovy: #4EC9B0", "hc_light": "storage.type.annotation.groovy: #185E73", - "light_plus_experimental": "storage.type.annotation.groovy: #267F99" + "light_modern": "storage.type.annotation.groovy: #267F99" } }, { @@ -12846,9 +12846,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.groovy: #4EC9B0", + "dark_modern": "storage.type.primitive.groovy: #4EC9B0", "hc_light": "storage.type.primitive.groovy: #185E73", - "light_plus_experimental": "storage.type.primitive.groovy: #267F99" + "light_modern": "storage.type.primitive.groovy: #267F99" } }, { @@ -12860,9 +12860,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12874,9 +12874,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -12888,9 +12888,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12902,9 +12902,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.groovy: #4EC9B0", + "dark_modern": "storage.type.primitive.groovy: #4EC9B0", "hc_light": "storage.type.primitive.groovy: #185E73", - "light_plus_experimental": "storage.type.primitive.groovy: #267F99" + "light_modern": "storage.type.primitive.groovy: #267F99" } }, { @@ -12916,9 +12916,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12930,9 +12930,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12944,9 +12944,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12958,9 +12958,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12972,9 +12972,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type.primitive.groovy: #4EC9B0", - "dark_plus_experimental": "storage.type.primitive.groovy: #4EC9B0", + "dark_modern": "storage.type.primitive.groovy: #4EC9B0", "hc_light": "storage.type.primitive.groovy: #185E73", - "light_plus_experimental": "storage.type.primitive.groovy: #267F99" + "light_modern": "storage.type.primitive.groovy: #267F99" } }, { @@ -12986,9 +12986,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13000,9 +13000,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13014,9 +13014,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13028,9 +13028,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13042,9 +13042,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13056,9 +13056,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13070,9 +13070,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13084,9 +13084,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13098,9 +13098,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13112,9 +13112,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -13126,9 +13126,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13140,9 +13140,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13154,9 +13154,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13168,9 +13168,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13182,9 +13182,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13196,9 +13196,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13210,9 +13210,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13224,9 +13224,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13238,9 +13238,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13252,9 +13252,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13266,9 +13266,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } } ] \ No newline at end of file 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 33d3c1637ae..2ee4ccd1f3b 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -120,9 +120,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -232,9 +232,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -302,9 +302,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -512,9 +512,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -582,9 +582,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -750,9 +750,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -834,9 +834,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -848,9 +848,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -890,9 +890,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -974,9 +974,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ 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 149c4d79297..b79247facaa 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -260,9 +260,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -470,9 +470,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -484,9 +484,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -540,9 +540,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -554,9 +554,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -568,9 +568,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -582,9 +582,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -638,9 +638,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -750,9 +750,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -820,9 +820,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -848,9 +848,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -890,9 +890,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -946,9 +946,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -960,9 +960,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.handlebars: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.handlebars: #0F4A85", - "light_plus_experimental": "string.quoted.double.handlebars: #0000FF" + "light_modern": "string.quoted.double.handlebars: #0000FF" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.constant.handlebars: #DCDCAA", - "dark_plus_experimental": "support.constant.handlebars: #DCDCAA", + "dark_modern": "support.constant.handlebars: #DCDCAA", "hc_light": "support.constant.handlebars: #5E2CBC", - "light_plus_experimental": "support.constant.handlebars: #795E26" + "light_modern": "support.constant.handlebars: #795E26" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json index 3a5d8d64bd2..5325987d5da 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ 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 e4fab060509..6257a7ad456 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_html.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_html.json @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -540,9 +540,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -624,9 +624,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -680,9 +680,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -694,9 +694,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -708,9 +708,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -736,9 +736,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -750,9 +750,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -778,9 +778,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -806,9 +806,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -820,9 +820,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -848,9 +848,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -890,9 +890,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -918,9 +918,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -932,9 +932,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -946,9 +946,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -960,9 +960,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -974,9 +974,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -988,9 +988,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.html: #0F4A85", - "light_plus_experimental": "string.unquoted.html: #0000FF" + "light_modern": "string.unquoted.html: #0000FF" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_ini.json b/extensions/vscode-colorize-tests/test/colorize-results/test_ini.json index dc11beb4bcd..c4babf18a6a 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_ini.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ini.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -358,9 +358,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -372,9 +372,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json index 05bc4802fbb..a559ba6edfc 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -148,9 +148,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_js.json b/extensions/vscode-colorize-tests/test/colorize-results/test_js.json index 9e9a6176b93..c4bb55a1e22 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_js.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_js.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -232,9 +232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -400,9 +400,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -414,9 +414,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -582,9 +582,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -596,9 +596,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -764,9 +764,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -778,9 +778,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -946,9 +946,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -960,9 +960,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4474,9 +4474,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4488,9 +4488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4502,9 +4502,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4516,9 +4516,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4530,9 +4530,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4544,9 +4544,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4558,9 +4558,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4572,9 +4572,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4586,9 +4586,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4600,9 +4600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4614,9 +4614,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4628,9 +4628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4642,9 +4642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4656,9 +4656,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4670,9 +4670,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4684,9 +4684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4698,9 +4698,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -4712,9 +4712,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4726,9 +4726,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4740,9 +4740,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4754,9 +4754,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4768,9 +4768,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4782,9 +4782,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4796,9 +4796,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4810,9 +4810,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4824,9 +4824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4838,9 +4838,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4852,9 +4852,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4866,9 +4866,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4880,9 +4880,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4894,9 +4894,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4908,9 +4908,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_json.json b/extensions/vscode-colorize-tests/test/colorize-results/test_json.json index 61640e774dc..60a9755e349 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_json.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_json.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -92,9 +92,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -106,9 +106,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -190,9 +190,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -204,9 +204,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -302,9 +302,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -316,9 +316,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -414,9 +414,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -428,9 +428,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -484,9 +484,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -568,9 +568,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -582,9 +582,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -680,9 +680,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -694,9 +694,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -792,9 +792,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -806,9 +806,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -932,9 +932,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -946,9 +946,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file 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 e6c4700423a..ed8845d9816 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -806,9 +806,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -848,9 +848,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ 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 7cbb24253be..6937f0e26dc 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -64,9 +64,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -78,9 +78,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -246,9 +246,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -302,9 +302,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -316,9 +316,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.rgb-value: #0451A5", "hc_black": "constant.other.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.rgb-value: #CE9178", + "dark_modern": "constant.other.rgb-value: #CE9178", "hc_light": "constant.other.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.rgb-value: #0451A5" + "light_modern": "constant.other.rgb-value: #0451A5" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "entity.other.attribute-name.class.mixin.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.mixin.css: #800000", "hc_black": "entity.other.attribute-name.class.mixin.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.mixin.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.mixin.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.mixin.css: #800000" + "light_modern": "entity.other.attribute-name.class.mixin.css: #800000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "entity.other.attribute-name.class.mixin.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.mixin.css: #800000", "hc_black": "entity.other.attribute-name.class.mixin.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.mixin.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.mixin.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.mixin.css: #800000" + "light_modern": "entity.other.attribute-name.class.mixin.css: #800000" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -960,9 +960,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "entity.other.attribute-name.class.mixin.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.mixin.css: #800000", "hc_black": "entity.other.attribute-name.class.mixin.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.mixin.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.mixin.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.mixin.css: #800000" + "light_modern": "entity.other.attribute-name.class.mixin.css: #800000" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "entity.other.attribute-name.class.mixin.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.mixin.css: #800000", "hc_black": "entity.other.attribute-name.class.mixin.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.mixin.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.mixin.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.mixin.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.mixin.css: #800000" + "light_modern": "entity.other.attribute-name.class.mixin.css: #800000" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D", "light_vs": "source.css.less entity.other.attribute-name.id: #800000", "hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D", - "dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D", + "dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D", "hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85", - "light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000" + "light_modern": "source.css.less entity.other.attribute-name.id: #800000" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D", "light_vs": "source.css.less entity.other.attribute-name.id: #800000", "hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D", - "dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D", + "dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D", "hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85", - "light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000" + "light_modern": "source.css.less entity.other.attribute-name.id: #800000" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "entity.other.attribute-name.parent-selector.css: #D7BA7D", "light_vs": "entity.other.attribute-name.parent-selector.css: #800000", "hc_black": "entity.other.attribute-name.parent-selector.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.parent-selector.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.parent-selector.css: #D7BA7D", "hc_light": "entity.other.attribute-name.parent-selector.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.parent-selector.css: #800000" + "light_modern": "entity.other.attribute-name.parent-selector.css: #800000" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.rgb-value: #0451A5", "hc_black": "constant.other.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.rgb-value: #CE9178", + "dark_modern": "constant.other.rgb-value: #CE9178", "hc_light": "constant.other.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.rgb-value: #0451A5" + "light_modern": "constant.other.rgb-value: #0451A5" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.rgb-value: #0451A5", "hc_black": "constant.other.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.rgb-value: #CE9178", + "dark_modern": "constant.other.rgb-value: #CE9178", "hc_light": "constant.other.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.rgb-value: #0451A5" + "light_modern": "constant.other.rgb-value: #0451A5" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D", "light_vs": "source.css.less entity.other.attribute-name.id: #800000", "hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D", - "dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D", + "dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D", "hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85", - "light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000" + "light_modern": "source.css.less entity.other.attribute-name.id: #800000" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D", "light_vs": "source.css.less entity.other.attribute-name.id: #800000", "hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D", - "dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D", + "dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D", "hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85", - "light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000" + "light_modern": "source.css.less entity.other.attribute-name.id: #800000" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D", "light_vs": "source.css.less entity.other.attribute-name.id: #800000", "hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D", - "dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D", + "dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D", "hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85", - "light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000" + "light_modern": "source.css.less entity.other.attribute-name.id: #800000" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "source.css.less entity.other.attribute-name.id: #D7BA7D", "light_vs": "source.css.less entity.other.attribute-name.id: #800000", "hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D", - "dark_plus_experimental": "source.css.less entity.other.attribute-name.id: #D7BA7D", + "dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D", "hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85", - "light_plus_experimental": "source.css.less entity.other.attribute-name.id: #800000" + "light_modern": "source.css.less entity.other.attribute-name.id: #800000" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.rgb-value: #0451A5", "hc_black": "constant.other.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.rgb-value: #CE9178", + "dark_modern": "constant.other.rgb-value: #CE9178", "hc_light": "constant.other.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.rgb-value: #0451A5" + "light_modern": "constant.other.rgb-value: #0451A5" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "variable.other.less: #9CDCFE", "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", - "dark_plus_experimental": "variable.other.less: #9CDCFE", + "dark_modern": "variable.other.less: #9CDCFE", "hc_light": "variable.other.less: #264F78", - "light_plus_experimental": "variable.other.less: #E50000" + "light_modern": "variable.other.less: #E50000" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_log.json b/extensions/vscode-colorize-tests/test/colorize-results/test_log.json index 5680f24acb6..f75b3a1731a 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_log.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_log.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json b/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json index d0efedccff6..c7a93a0446f 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -526,9 +526,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -680,9 +680,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -694,9 +694,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -834,9 +834,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -848,9 +848,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -890,9 +890,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_m.json b/extensions/vscode-colorize-tests/test/colorize-results/test_m.json index 342d9d8fc84..c6c7e2d6278 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_m.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_m.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -78,9 +78,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -92,9 +92,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -120,9 +120,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -148,9 +148,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -162,9 +162,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -176,9 +176,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -232,9 +232,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -316,9 +316,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -750,9 +750,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "keyword.operator.minus.exponent: #B5CEA8", "light_vs": "keyword.operator.minus.exponent: #098658", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator.minus.exponent: #B5CEA8", + "dark_modern": "keyword.operator.minus.exponent: #B5CEA8", "hc_light": "keyword.operator.minus.exponent: #096D48", - "light_plus_experimental": "keyword.operator.minus.exponent: #098658" + "light_modern": "keyword.operator.minus.exponent: #098658" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } } ] \ No newline at end of file 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 179bf535a31..648feab845a 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_md.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_md.json @@ -8,9 +8,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -456,9 +456,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -470,9 +470,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -540,9 +540,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -554,9 +554,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -624,9 +624,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -638,9 +638,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -652,9 +652,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -708,9 +708,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -778,9 +778,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -820,9 +820,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -848,9 +848,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -890,9 +890,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -904,9 +904,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.single.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.single.html: #0F4A85", - "light_plus_experimental": "string.quoted.single.html: #0000FF" + "light_modern": "string.quoted.single.html: #0000FF" } }, { @@ -918,9 +918,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -932,9 +932,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -946,9 +946,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -960,9 +960,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -974,9 +974,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -988,9 +988,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.html: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.html: #0F4A85", - "light_plus_experimental": "string.quoted.double.html: #0000FF" + "light_modern": "string.quoted.double.html: #0000FF" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "markup.inline.raw: #CE9178", "light_vs": "markup.inline.raw: #800000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.inline.raw: #CE9178", + "dark_modern": "markup.inline.raw: #CE9178", "hc_light": "markup.inline.raw: #0F4A85", - "light_plus_experimental": "markup.inline.raw: #800000" + "light_modern": "markup.inline.raw: #800000" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "markup.inline.raw: #CE9178", "light_vs": "markup.inline.raw: #800000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.inline.raw: #CE9178", + "dark_modern": "markup.inline.raw: #CE9178", "hc_light": "markup.inline.raw: #0F4A85", - "light_plus_experimental": "markup.inline.raw: #800000" + "light_modern": "markup.inline.raw: #800000" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "markup.inline.raw: #CE9178", "light_vs": "markup.inline.raw: #800000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.inline.raw: #CE9178", + "dark_modern": "markup.inline.raw: #CE9178", "hc_light": "markup.inline.raw: #0F4A85", - "light_plus_experimental": "markup.inline.raw: #800000" + "light_modern": "markup.inline.raw: #800000" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "punctuation.definition.quote.begin.markdown: #6A9955", "light_vs": "punctuation.definition.quote.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.quote.begin.markdown: #6A9955", + "dark_modern": "punctuation.definition.quote.begin.markdown: #6A9955", "hc_light": "punctuation.definition.quote.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.quote.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.quote.begin.markdown: #0451A5" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "punctuation.definition.quote.begin.markdown: #6A9955", "light_vs": "punctuation.definition.quote.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.quote.begin.markdown: #6A9955", + "dark_modern": "punctuation.definition.quote.begin.markdown: #6A9955", "hc_light": "punctuation.definition.quote.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.quote.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.quote.begin.markdown: #0451A5" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "punctuation.definition.quote.begin.markdown: #6A9955", "light_vs": "punctuation.definition.quote.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.quote.begin.markdown: #6A9955", + "dark_modern": "punctuation.definition.quote.begin.markdown: #6A9955", "hc_light": "punctuation.definition.quote.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.quote.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.quote.begin.markdown: #0451A5" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "punctuation.definition.quote.begin.markdown: #6A9955", "light_vs": "punctuation.definition.quote.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.quote.begin.markdown: #6A9955", + "dark_modern": "punctuation.definition.quote.begin.markdown: #6A9955", "hc_light": "punctuation.definition.quote.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.quote.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.quote.begin.markdown: #0451A5" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,23 +2710,23 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "\"", - "t": "text.html.markdown meta.paragraph.markdown meta.image.inline.markdown string.other.link.description.title.markdown punctuation.definition.string.markdown", + "t": "text.html.markdown meta.paragraph.markdown meta.image.inline.markdown string.other.link.description.title.markdown punctuation.definition.string.begin.markdown", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2738,23 +2738,23 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { "c": "\"", - "t": "text.html.markdown meta.paragraph.markdown meta.image.inline.markdown string.other.link.description.title.markdown punctuation.definition.string.markdown", + "t": "text.html.markdown meta.paragraph.markdown meta.image.inline.markdown string.other.link.description.title.markdown punctuation.definition.string.end.markdown", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -2836,65 +2836,485 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { - "c": "| Header | Header | Right |", - "t": "text.html.markdown meta.paragraph.markdown", + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { - "c": "| ------ | ------ | -----: |", - "t": "text.html.markdown meta.paragraph.markdown", + "c": " Header ", + "t": "text.html.markdown markup.table.markdown", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { - "c": "| Cell | Cell | $10 |", - "t": "text.html.markdown meta.paragraph.markdown", + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { - "c": "| Cell | Cell | $20 |", - "t": "text.html.markdown meta.paragraph.markdown", + "c": " Header ", + "t": "text.html.markdown markup.table.markdown", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " Right ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "------", + "t": "text.html.markdown markup.table.markdown punctuation.separator.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "------", + "t": "text.html.markdown markup.table.markdown punctuation.separator.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "-----:", + "t": "text.html.markdown markup.table.markdown punctuation.separator.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " Cell ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " Cell ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " $10 ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " Cell ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " Cell ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": " $20 ", + "t": "text.html.markdown markup.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" + } + }, + { + "c": "|", + "t": "text.html.markdown markup.table.markdown punctuation.definition.table.markdown", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +3326,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -2920,9 +3340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2934,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +3368,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -2962,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2990,9 +3410,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -3004,9 +3424,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -3018,9 +3438,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -3032,9 +3452,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -3046,9 +3466,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -3060,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3074,9 +3494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3102,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3116,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3130,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3144,9 +3564,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -3158,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3172,9 +3592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3186,9 +3606,9 @@ "dark_vs": "punctuation.definition.list.begin.markdown: #6796E6", "light_vs": "punctuation.definition.list.begin.markdown: #0451A5", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "punctuation.definition.list.begin.markdown: #6796E6", + "dark_modern": "punctuation.definition.list.begin.markdown: #6796E6", "hc_light": "punctuation.definition.list.begin.markdown: #0451A5", - "light_plus_experimental": "punctuation.definition.list.begin.markdown: #0451A5" + "light_modern": "punctuation.definition.list.begin.markdown: #0451A5" } }, { @@ -3200,9 +3620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3214,9 +3634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3242,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3256,9 +3676,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3270,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3284,9 +3704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3298,9 +3718,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3312,9 +3732,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3326,9 +3746,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -3340,9 +3760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json b/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json index 8a6c7929f7b..eeb16d5b737 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -78,9 +78,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -92,9 +92,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -120,9 +120,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -148,9 +148,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -162,9 +162,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -176,9 +176,9 @@ "dark_vs": "meta.preprocessor: #569CD6", "light_vs": "meta.preprocessor: #0000FF", "hc_black": "meta.preprocessor: #569CD6", - "dark_plus_experimental": "meta.preprocessor: #569CD6", + "dark_modern": "meta.preprocessor: #569CD6", "hc_light": "meta.preprocessor: #0F4A85", - "light_plus_experimental": "meta.preprocessor: #0000FF" + "light_modern": "meta.preprocessor: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -232,9 +232,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -316,9 +316,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -750,9 +750,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "keyword.operator.minus.exponent: #B5CEA8", "light_vs": "keyword.operator.minus.exponent: #098658", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator.minus.exponent: #B5CEA8", + "dark_modern": "keyword.operator.minus.exponent: #B5CEA8", "hc_light": "keyword.operator.minus.exponent: #096D48", - "light_plus_experimental": "keyword.operator.minus.exponent: #098658" + "light_modern": "keyword.operator.minus.exponent: #098658" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_php.json b/extensions/vscode-colorize-tests/test/colorize-results/test_php.json index ddd12ae8d5c..ea79b0e2006 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_php.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_php.json @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "punctuation.section.embedded.begin.php: #569CD6", "light_vs": "punctuation.section.embedded.begin.php: #800000", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded.begin.php: #569CD6", + "dark_modern": "punctuation.section.embedded.begin.php: #569CD6", "hc_light": "punctuation.section.embedded.begin.php: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded.begin.php: #800000" + "light_modern": "punctuation.section.embedded.begin.php: #800000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -330,9 +330,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -358,9 +358,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -414,9 +414,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -456,9 +456,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -470,9 +470,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -568,9 +568,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -582,9 +582,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -596,9 +596,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -624,9 +624,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -652,9 +652,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -680,9 +680,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -694,9 +694,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -708,9 +708,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -736,9 +736,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -750,9 +750,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -764,9 +764,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -778,9 +778,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -806,9 +806,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -820,9 +820,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -834,9 +834,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -848,9 +848,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -890,9 +890,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -904,9 +904,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -918,9 +918,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -932,9 +932,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -946,9 +946,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -960,9 +960,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -974,9 +974,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -988,9 +988,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4474,9 +4474,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4488,9 +4488,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4502,9 +4502,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "meta.embedded: #FFFFFF", - "dark_plus_experimental": "meta.embedded: #D4D4D4", + "dark_modern": "meta.embedded: #D4D4D4", "hc_light": "meta.embedded: #292929", - "light_plus_experimental": "meta.embedded: #000000" + "light_modern": "meta.embedded: #000000" } }, { @@ -4516,9 +4516,9 @@ "dark_vs": "punctuation.section.embedded.end.php: #569CD6", "light_vs": "punctuation.section.embedded.end.php: #800000", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded.end.php: #569CD6", + "dark_modern": "punctuation.section.embedded.end.php: #569CD6", "hc_light": "punctuation.section.embedded.end.php: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded.end.php: #800000" + "light_modern": "punctuation.section.embedded.end.php: #800000" } }, { @@ -4530,9 +4530,9 @@ "dark_vs": "punctuation.section.embedded.end.php: #569CD6", "light_vs": "punctuation.section.embedded.end.php: #800000", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded.end.php: #569CD6", + "dark_modern": "punctuation.section.embedded.end.php: #569CD6", "hc_light": "punctuation.section.embedded.end.php: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded.end.php: #800000" + "light_modern": "punctuation.section.embedded.end.php: #800000" } }, { @@ -4544,9 +4544,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4558,9 +4558,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4572,9 +4572,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4586,9 +4586,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -4600,9 +4600,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4614,9 +4614,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json index 35ff3df0e7e..1a80edc135c 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -484,9 +484,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -554,9 +554,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -568,9 +568,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -582,9 +582,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -610,9 +610,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -624,9 +624,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -638,9 +638,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -848,9 +848,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -862,9 +862,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json b/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json index 3d67e45b5a2..7fee15950e9 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "source.powershell variable.other.member: #DCDCAA", - "dark_plus_experimental": "source.powershell variable.other.member: #DCDCAA", + "dark_modern": "source.powershell variable.other.member: #DCDCAA", "hc_light": "source.powershell variable.other.member: #5E2CBC", - "light_plus_experimental": "source.powershell variable.other.member: #795E26" + "light_modern": "source.powershell variable.other.member: #795E26" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -848,9 +848,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -862,9 +862,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file 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 6937100ab9f..eb506aa3365 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json @@ -8,9 +8,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.comment.buffered.block.pug: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.comment.buffered.block.pug: #0F4A85", - "light_plus_experimental": "string.comment.buffered.block.pug: #0000FF" + "light_modern": "string.comment.buffered.block.pug: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.comment.buffered.block.pug: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.comment.buffered.block.pug: #0F4A85", - "light_plus_experimental": "string.comment.buffered.block.pug: #0000FF" + "light_modern": "string.comment.buffered.block.pug: #0000FF" } }, { @@ -36,9 +36,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.comment.buffered.block.pug: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.comment.buffered.block.pug: #0F4A85", - "light_plus_experimental": "string.comment.buffered.block.pug: #0000FF" + "light_modern": "string.comment.buffered.block.pug: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -204,9 +204,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -246,9 +246,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -316,9 +316,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -330,9 +330,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -610,9 +610,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -624,9 +624,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -638,9 +638,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -680,9 +680,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -694,9 +694,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -736,9 +736,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -750,9 +750,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -764,9 +764,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "meta.object-literal.key: #9CDCFE", - "dark_plus_experimental": "meta.object-literal.key: #9CDCFE", + "dark_modern": "meta.object-literal.key: #9CDCFE", "hc_light": "meta.object-literal.key: #001080", - "light_plus_experimental": "meta.object-literal.key: #001080" + "light_modern": "meta.object-literal.key: #001080" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.comment.buffered.block.pug: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.comment.buffered.block.pug: #0F4A85", - "light_plus_experimental": "string.comment.buffered.block.pug: #0000FF" + "light_modern": "string.comment.buffered.block.pug: #0000FF" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.interpolated.pug: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.interpolated.pug: #0F4A85", - "light_plus_experimental": "string.interpolated.pug: #0000FF" + "light_modern": "string.interpolated.pug: #0000FF" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.interpolated.pug: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.interpolated.pug: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.interpolated.pug: #0F4A85", - "light_plus_experimental": "string.interpolated.pug: #0000FF" + "light_modern": "string.interpolated.pug: #0000FF" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.interpolated.pug: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.interpolated.pug: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.interpolated.pug: #0F4A85", - "light_plus_experimental": "string.interpolated.pug: #0000FF" + "light_modern": "string.interpolated.pug: #0000FF" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_py.json b/extensions/vscode-colorize-tests/test/colorize-results/test_py.json index 8af9e99171c..e858cd5f201 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_py.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_py.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,51 +386,51 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "'''", "t": "source.python string.quoted.docstring.multi.python punctuation.definition.string.begin.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "Make the monkey eat N bananas!", "t": "source.python string.quoted.docstring.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "'''", "t": "source.python string.quoted.docstring.multi.python punctuation.definition.string.end.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -806,9 +806,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -820,9 +820,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -988,9 +988,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "keyword.operator.logical.python: #569CD6", "light_vs": "keyword.operator.logical.python: #0000FF", "hc_black": "keyword.operator.logical.python: #569CD6", - "dark_plus_experimental": "keyword.operator.logical.python: #569CD6", + "dark_modern": "keyword.operator.logical.python: #569CD6", "hc_light": "keyword.operator.logical.python: #0F4A85", - "light_plus_experimental": "keyword.operator.logical.python: #0000FF" + "light_modern": "keyword.operator.logical.python: #0000FF" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "keyword.operator.logical.python: #569CD6", "light_vs": "keyword.operator.logical.python: #0000FF", "hc_black": "keyword.operator.logical.python: #569CD6", - "dark_plus_experimental": "keyword.operator.logical.python: #569CD6", + "dark_modern": "keyword.operator.logical.python: #569CD6", "hc_light": "keyword.operator.logical.python: #0F4A85", - "light_plus_experimental": "keyword.operator.logical.python: #0000FF" + "light_modern": "keyword.operator.logical.python: #0000FF" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3172,51 +3172,51 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { "c": "\"\"\"", "t": "source.python string.quoted.docstring.multi.python punctuation.definition.string.begin.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "Berechnung der zu zahlenden Steuern fuer ein zu versteuerndes Einkommen von x", "t": "source.python string.quoted.docstring.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\"\"\"", "t": "source.python string.quoted.docstring.multi.python punctuation.definition.string.end.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4474,9 +4474,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -4488,9 +4488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4502,9 +4502,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4516,9 +4516,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4530,9 +4530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4544,9 +4544,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -4558,9 +4558,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4572,9 +4572,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4586,9 +4586,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4600,9 +4600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4614,9 +4614,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -4628,9 +4628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4642,9 +4642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4656,9 +4656,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4670,9 +4670,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4684,9 +4684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4698,9 +4698,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4712,9 +4712,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4726,9 +4726,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4740,9 +4740,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -4754,9 +4754,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4768,9 +4768,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4782,9 +4782,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4796,9 +4796,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4810,9 +4810,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4824,9 +4824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4838,9 +4838,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -4852,9 +4852,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4866,9 +4866,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4880,9 +4880,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4894,9 +4894,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4908,9 +4908,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4922,9 +4922,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4936,9 +4936,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4950,9 +4950,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4964,9 +4964,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4978,9 +4978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4992,9 +4992,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -5006,9 +5006,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5020,9 +5020,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5034,9 +5034,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5048,9 +5048,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5062,9 +5062,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5076,9 +5076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5090,9 +5090,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5104,9 +5104,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5118,9 +5118,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5132,9 +5132,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -5146,9 +5146,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5160,9 +5160,9 @@ "dark_vs": "keyword.operator.logical.python: #569CD6", "light_vs": "keyword.operator.logical.python: #0000FF", "hc_black": "keyword.operator.logical.python: #569CD6", - "dark_plus_experimental": "keyword.operator.logical.python: #569CD6", + "dark_modern": "keyword.operator.logical.python: #569CD6", "hc_light": "keyword.operator.logical.python: #0F4A85", - "light_plus_experimental": "keyword.operator.logical.python: #0000FF" + "light_modern": "keyword.operator.logical.python: #0000FF" } }, { @@ -5174,9 +5174,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5188,9 +5188,9 @@ "dark_vs": "keyword.operator.logical.python: #569CD6", "light_vs": "keyword.operator.logical.python: #0000FF", "hc_black": "keyword.operator.logical.python: #569CD6", - "dark_plus_experimental": "keyword.operator.logical.python: #569CD6", + "dark_modern": "keyword.operator.logical.python: #569CD6", "hc_light": "keyword.operator.logical.python: #0F4A85", - "light_plus_experimental": "keyword.operator.logical.python: #0000FF" + "light_modern": "keyword.operator.logical.python: #0000FF" } }, { @@ -5202,9 +5202,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5216,9 +5216,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -5230,9 +5230,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5244,9 +5244,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5258,9 +5258,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5272,9 +5272,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5286,9 +5286,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -5300,9 +5300,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5314,9 +5314,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5328,9 +5328,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5342,9 +5342,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5356,9 +5356,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5370,9 +5370,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5384,9 +5384,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5398,9 +5398,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5412,9 +5412,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -5426,9 +5426,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5440,9 +5440,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5454,9 +5454,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5468,9 +5468,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5482,9 +5482,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5496,9 +5496,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5510,9 +5510,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5524,9 +5524,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -5538,9 +5538,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5552,9 +5552,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -5566,9 +5566,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5580,9 +5580,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5594,9 +5594,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5608,9 +5608,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5622,9 +5622,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5636,9 +5636,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5650,9 +5650,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5664,9 +5664,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5678,9 +5678,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5692,9 +5692,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5706,9 +5706,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5720,9 +5720,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5734,9 +5734,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -5748,9 +5748,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "support.other.parenthesis.regexp: #CE9178", + "dark_modern": "support.other.parenthesis.regexp: #CE9178", "hc_light": "support.other.parenthesis.regexp: #D16969", - "light_plus_experimental": "support.other.parenthesis.regexp: #D16969" + "light_modern": "support.other.parenthesis.regexp: #D16969" } }, { @@ -5762,9 +5762,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "punctuation.character.set.begin.regexp: #CE9178", + "dark_modern": "punctuation.character.set.begin.regexp: #CE9178", "hc_light": "punctuation.character.set.begin.regexp: #D16969", - "light_plus_experimental": "punctuation.character.set.begin.regexp: #D16969" + "light_modern": "punctuation.character.set.begin.regexp: #D16969" } }, { @@ -5776,9 +5776,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.set.regexp: #D16969", + "dark_modern": "constant.character.set.regexp: #D16969", "hc_light": "constant.character.set.regexp: #811F3F", - "light_plus_experimental": "constant.character.set.regexp: #811F3F" + "light_modern": "constant.character.set.regexp: #811F3F" } }, { @@ -5790,9 +5790,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "punctuation.character.set.end.regexp: #CE9178", + "dark_modern": "punctuation.character.set.end.regexp: #CE9178", "hc_light": "punctuation.character.set.end.regexp: #D16969", - "light_plus_experimental": "punctuation.character.set.end.regexp: #D16969" + "light_modern": "punctuation.character.set.end.regexp: #D16969" } }, { @@ -5804,9 +5804,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator.quantifier.regexp: #D7BA7D", + "dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D", "hc_light": "keyword.operator.quantifier.regexp: #000000", - "light_plus_experimental": "keyword.operator.quantifier.regexp: #000000" + "light_modern": "keyword.operator.quantifier.regexp: #000000" } }, { @@ -5818,9 +5818,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "support.other.parenthesis.regexp: #CE9178", + "dark_modern": "support.other.parenthesis.regexp: #CE9178", "hc_light": "support.other.parenthesis.regexp: #D16969", - "light_plus_experimental": "support.other.parenthesis.regexp: #D16969" + "light_modern": "support.other.parenthesis.regexp: #D16969" } }, { @@ -5832,9 +5832,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -5846,9 +5846,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator.quantifier.regexp: #D7BA7D", + "dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D", "hc_light": "keyword.operator.quantifier.regexp: #000000", - "light_plus_experimental": "keyword.operator.quantifier.regexp: #000000" + "light_modern": "keyword.operator.quantifier.regexp: #000000" } }, { @@ -5860,9 +5860,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "support.other.parenthesis.regexp: #CE9178", + "dark_modern": "support.other.parenthesis.regexp: #CE9178", "hc_light": "support.other.parenthesis.regexp: #D16969", - "light_plus_experimental": "support.other.parenthesis.regexp: #D16969" + "light_modern": "support.other.parenthesis.regexp: #D16969" } }, { @@ -5874,9 +5874,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "punctuation.character.set.begin.regexp: #CE9178", + "dark_modern": "punctuation.character.set.begin.regexp: #CE9178", "hc_light": "punctuation.character.set.begin.regexp: #D16969", - "light_plus_experimental": "punctuation.character.set.begin.regexp: #D16969" + "light_modern": "punctuation.character.set.begin.regexp: #D16969" } }, { @@ -5888,9 +5888,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.set.regexp: #D16969", + "dark_modern": "constant.character.set.regexp: #D16969", "hc_light": "constant.character.set.regexp: #811F3F", - "light_plus_experimental": "constant.character.set.regexp: #811F3F" + "light_modern": "constant.character.set.regexp: #811F3F" } }, { @@ -5902,9 +5902,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "punctuation.character.set.end.regexp: #CE9178", + "dark_modern": "punctuation.character.set.end.regexp: #CE9178", "hc_light": "punctuation.character.set.end.regexp: #D16969", - "light_plus_experimental": "punctuation.character.set.end.regexp: #D16969" + "light_modern": "punctuation.character.set.end.regexp: #D16969" } }, { @@ -5916,9 +5916,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator.quantifier.regexp: #D7BA7D", + "dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D", "hc_light": "keyword.operator.quantifier.regexp: #000000", - "light_plus_experimental": "keyword.operator.quantifier.regexp: #000000" + "light_modern": "keyword.operator.quantifier.regexp: #000000" } }, { @@ -5930,9 +5930,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "support.other.parenthesis.regexp: #CE9178", + "dark_modern": "support.other.parenthesis.regexp: #CE9178", "hc_light": "support.other.parenthesis.regexp: #D16969", - "light_plus_experimental": "support.other.parenthesis.regexp: #D16969" + "light_modern": "support.other.parenthesis.regexp: #D16969" } }, { @@ -5944,9 +5944,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -5958,9 +5958,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -5972,9 +5972,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator.quantifier.regexp: #D7BA7D", + "dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D", "hc_light": "keyword.operator.quantifier.regexp: #000000", - "light_plus_experimental": "keyword.operator.quantifier.regexp: #000000" + "light_modern": "keyword.operator.quantifier.regexp: #000000" } }, { @@ -5986,9 +5986,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "support.other.parenthesis.regexp: #CE9178", + "dark_modern": "support.other.parenthesis.regexp: #CE9178", "hc_light": "support.other.parenthesis.regexp: #D16969", - "light_plus_experimental": "support.other.parenthesis.regexp: #D16969" + "light_modern": "support.other.parenthesis.regexp: #D16969" } }, { @@ -6000,9 +6000,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -6014,9 +6014,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator.quantifier.regexp: #D7BA7D", + "dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D", "hc_light": "keyword.operator.quantifier.regexp: #000000", - "light_plus_experimental": "keyword.operator.quantifier.regexp: #000000" + "light_modern": "keyword.operator.quantifier.regexp: #000000" } }, { @@ -6028,9 +6028,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "support.other.parenthesis.regexp: #CE9178", + "dark_modern": "support.other.parenthesis.regexp: #CE9178", "hc_light": "support.other.parenthesis.regexp: #D16969", - "light_plus_experimental": "support.other.parenthesis.regexp: #D16969" + "light_modern": "support.other.parenthesis.regexp: #D16969" } }, { @@ -6042,9 +6042,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -6056,9 +6056,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6070,9 +6070,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6084,9 +6084,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6098,9 +6098,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6112,9 +6112,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6126,9 +6126,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -6140,9 +6140,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6154,9 +6154,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6168,9 +6168,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6182,9 +6182,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6196,9 +6196,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6210,9 +6210,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6224,9 +6224,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6238,9 +6238,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6252,9 +6252,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6266,9 +6266,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6280,9 +6280,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6294,9 +6294,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6308,9 +6308,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6322,9 +6322,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6336,9 +6336,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6350,9 +6350,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6364,9 +6364,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -6378,9 +6378,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6392,9 +6392,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6406,9 +6406,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6420,9 +6420,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6434,9 +6434,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6448,9 +6448,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6462,9 +6462,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6476,9 +6476,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6490,9 +6490,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -6504,9 +6504,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6518,9 +6518,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6532,9 +6532,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -6546,9 +6546,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6560,9 +6560,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6574,9 +6574,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6588,9 +6588,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6602,9 +6602,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6616,9 +6616,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6630,9 +6630,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6644,9 +6644,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6658,9 +6658,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6672,9 +6672,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6686,9 +6686,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6700,9 +6700,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6714,9 +6714,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6728,9 +6728,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6742,9 +6742,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6756,9 +6756,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6770,9 +6770,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6784,9 +6784,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6798,9 +6798,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6812,9 +6812,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6826,9 +6826,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6840,9 +6840,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6854,9 +6854,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6868,9 +6868,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6882,9 +6882,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6896,9 +6896,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6910,9 +6910,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6924,9 +6924,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6938,9 +6938,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6952,9 +6952,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6966,9 +6966,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6980,9 +6980,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6994,9 +6994,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7008,9 +7008,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7022,9 +7022,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7036,9 +7036,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7050,9 +7050,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7064,9 +7064,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7078,9 +7078,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7092,9 +7092,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7106,9 +7106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7120,9 +7120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7134,9 +7134,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7148,9 +7148,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7162,9 +7162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7176,9 +7176,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7190,9 +7190,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7204,9 +7204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7218,9 +7218,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7232,9 +7232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7246,9 +7246,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -7260,9 +7260,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -7274,9 +7274,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -7288,9 +7288,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "punctuation.character.set.begin.regexp: #CE9178", + "dark_modern": "punctuation.character.set.begin.regexp: #CE9178", "hc_light": "punctuation.character.set.begin.regexp: #D16969", - "light_plus_experimental": "punctuation.character.set.begin.regexp: #D16969" + "light_modern": "punctuation.character.set.begin.regexp: #D16969" } }, { @@ -7302,9 +7302,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.set.regexp: #D16969", + "dark_modern": "constant.character.set.regexp: #D16969", "hc_light": "constant.character.set.regexp: #811F3F", - "light_plus_experimental": "constant.character.set.regexp: #811F3F" + "light_modern": "constant.character.set.regexp: #811F3F" } }, { @@ -7316,9 +7316,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -7330,9 +7330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7344,9 +7344,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7358,9 +7358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7372,9 +7372,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -7386,9 +7386,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7400,9 +7400,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7414,65 +7414,65 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { "c": "'''", "t": "source.python string.quoted.docstring.raw.multi.python punctuation.definition.string.begin.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "Module docstring", "t": "source.python string.quoted.docstring.raw.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": " Some text followed by code sample:", "t": "source.python string.quoted.docstring.raw.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": " ", "t": "source.python string.quoted.docstring.raw.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { @@ -7484,37 +7484,37 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { "c": "for a in foo(2, b=1,", "t": "source.python string.quoted.docstring.raw.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": " ", "t": "source.python string.quoted.docstring.raw.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { @@ -7526,37 +7526,37 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { "c": " c=3):", "t": "source.python string.quoted.docstring.raw.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": " ", "t": "source.python string.quoted.docstring.raw.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { @@ -7568,65 +7568,65 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { "c": " print(a)", "t": "source.python string.quoted.docstring.raw.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": " 0", "t": "source.python string.quoted.docstring.raw.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": " 1", "t": "source.python string.quoted.docstring.raw.multi.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "'''", "t": "source.python string.quoted.docstring.raw.multi.python punctuation.definition.string.end.python", "r": { - "dark_plus": "string.quoted.docstring: #6A9955", - "light_plus": "string.quoted.docstring: #008000", - "dark_vs": "string.quoted.docstring: #6A9955", - "light_vs": "string.quoted.docstring: #008000", - "hc_black": "string.quoted.docstring: #7CA668", - "dark_plus_experimental": "string.quoted.docstring: #6A9955", - "hc_light": "string.quoted.docstring: #515151", - "light_plus_experimental": "string.quoted.docstring: #008000" + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_r.json b/extensions/vscode-colorize-tests/test/colorize-results/test_r.json index ac5499422fa..128918635b5 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_r.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_r.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -120,9 +120,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -134,9 +134,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -148,9 +148,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -162,9 +162,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -204,9 +204,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -232,9 +232,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -288,9 +288,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -302,9 +302,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -344,9 +344,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -750,9 +750,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -960,9 +960,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -974,9 +974,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json index 68adda281b2..d36726f9866 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.other.inherited-class: #4EC9B0", - "dark_plus_experimental": "entity.other.inherited-class: #4EC9B0", + "dark_modern": "entity.other.inherited-class: #4EC9B0", "hc_light": "entity.other.inherited-class: #185E73", - "light_plus_experimental": "entity.other.inherited-class: #267F99" + "light_modern": "entity.other.inherited-class: #267F99" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.other.inherited-class: #4EC9B0", - "dark_plus_experimental": "entity.other.inherited-class: #4EC9B0", + "dark_modern": "entity.other.inherited-class: #4EC9B0", "hc_light": "entity.other.inherited-class: #185E73", - "light_plus_experimental": "entity.other.inherited-class: #267F99" + "light_modern": "entity.other.inherited-class: #267F99" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.other.inherited-class: #4EC9B0", - "dark_plus_experimental": "entity.other.inherited-class: #4EC9B0", + "dark_modern": "entity.other.inherited-class: #4EC9B0", "hc_light": "entity.other.inherited-class: #185E73", - "light_plus_experimental": "entity.other.inherited-class: #267F99" + "light_modern": "entity.other.inherited-class: #267F99" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.other.inherited-class: #4EC9B0", - "dark_plus_experimental": "entity.other.inherited-class: #4EC9B0", + "dark_modern": "entity.other.inherited-class: #4EC9B0", "hc_light": "entity.other.inherited-class: #185E73", - "light_plus_experimental": "entity.other.inherited-class: #267F99" + "light_modern": "entity.other.inherited-class: #267F99" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.other.inherited-class: #4EC9B0", - "dark_plus_experimental": "entity.other.inherited-class: #4EC9B0", + "dark_modern": "entity.other.inherited-class: #4EC9B0", "hc_light": "entity.other.inherited-class: #185E73", - "light_plus_experimental": "entity.other.inherited-class: #267F99" + "light_modern": "entity.other.inherited-class: #267F99" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.other.constant: #4FC1FF", + "dark_modern": "variable.other.constant: #4FC1FF", "hc_light": "variable.other.constant: #02715D", - "light_plus_experimental": "variable.other.constant: #0070C1" + "light_modern": "variable.other.constant: #0070C1" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.other.constant: #4FC1FF", + "dark_modern": "variable.other.constant: #4FC1FF", "hc_light": "variable.other.constant: #02715D", - "light_plus_experimental": "variable.other.constant: #0070C1" + "light_modern": "variable.other.constant: #0070C1" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -792,9 +792,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -918,9 +918,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.other.constant: #4FC1FF", + "dark_modern": "variable.other.constant: #4FC1FF", "hc_light": "variable.other.constant: #02715D", - "light_plus_experimental": "variable.other.constant: #0070C1" + "light_modern": "variable.other.constant: #0070C1" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.other.constant: #4FC1FF", + "dark_modern": "variable.other.constant: #4FC1FF", "hc_light": "variable.other.constant: #02715D", - "light_plus_experimental": "variable.other.constant: #0070C1" + "light_modern": "variable.other.constant: #0070C1" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.other.constant: #4FC1FF", + "dark_modern": "variable.other.constant: #4FC1FF", "hc_light": "variable.other.constant: #02715D", - "light_plus_experimental": "variable.other.constant: #0070C1" + "light_modern": "variable.other.constant: #0070C1" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "meta.embedded: #D4D4D4", "light_vs": "meta.embedded: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable.other.constant: #4FC1FF", + "dark_modern": "variable.other.constant: #4FC1FF", "hc_light": "variable.other.constant: #02715D", - "light_plus_experimental": "variable.other.constant: #0070C1" + "light_modern": "variable.other.constant: #0070C1" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "punctuation.section.embedded: #569CD6", "light_vs": "punctuation.section.embedded: #0000FF", "hc_black": "punctuation.section.embedded: #569CD6", - "dark_plus_experimental": "punctuation.section.embedded: #569CD6", + "dark_modern": "punctuation.section.embedded: #569CD6", "hc_light": "punctuation.section.embedded: #0F4A85", - "light_plus_experimental": "punctuation.section.embedded: #0000FF" + "light_modern": "punctuation.section.embedded: #0000FF" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969", - "dark_plus_experimental": "string.regexp: #D16969", + "dark_modern": "string.regexp: #D16969", "hc_light": "string.regexp: #811F3F", - "light_plus_experimental": "string.regexp: #811F3F" + "light_modern": "string.regexp: #811F3F" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json index 461c0b1eb67..01f18f457a2 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json @@ -8,9 +8,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.namespace: #4EC9B0", - "dark_plus_experimental": "entity.name.namespace: #4EC9B0", + "dark_modern": "entity.name.namespace: #4EC9B0", "hc_light": "entity.name.namespace: #185E73", - "light_plus_experimental": "entity.name.namespace: #267F99" + "light_modern": "entity.name.namespace: #267F99" } }, { @@ -50,9 +50,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -232,9 +232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -344,9 +344,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -358,9 +358,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -540,9 +540,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.namespace: #4EC9B0", - "dark_plus_experimental": "entity.name.namespace: #4EC9B0", + "dark_modern": "entity.name.namespace: #4EC9B0", "hc_light": "entity.name.namespace: #185E73", - "light_plus_experimental": "entity.name.namespace: #267F99" + "light_modern": "entity.name.namespace: #267F99" } }, { @@ -624,9 +624,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -904,9 +904,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -918,9 +918,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json index 708ad1de07e..aa8468c4d8a 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "markup.bold: #569CD6", "light_vs": "markup.bold: #000080", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "markup.bold: #569CD6", + "dark_modern": "markup.bold: #569CD6", "hc_light": "markup.bold: #000080", - "light_plus_experimental": "markup.bold: #000080" + "light_modern": "markup.bold: #000080" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "markup.heading: #569CD6", "light_vs": "markup.heading: #800000", "hc_black": "markup.heading: #6796E6", - "dark_plus_experimental": "markup.heading: #569CD6", + "dark_modern": "markup.heading: #569CD6", "hc_light": "markup.heading: #0F4A85", - "light_plus_experimental": "markup.heading: #800000" + "light_modern": "markup.heading: #800000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -554,9 +554,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -624,9 +624,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -638,9 +638,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -708,9 +708,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -722,9 +722,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ 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 b23e24b0a7c..843cf288784 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -106,9 +106,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -386,9 +386,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -568,9 +568,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -918,9 +918,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-class.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-class.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-class.css: #800000" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4474,9 +4474,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4488,9 +4488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4502,9 +4502,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -4516,9 +4516,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4530,9 +4530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4544,9 +4544,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -4558,9 +4558,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4572,9 +4572,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -4586,9 +4586,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -4600,9 +4600,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4614,9 +4614,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -4628,9 +4628,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4642,9 +4642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4656,9 +4656,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4670,9 +4670,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4684,9 +4684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4698,9 +4698,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -4712,9 +4712,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4726,9 +4726,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4740,9 +4740,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4754,9 +4754,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4768,9 +4768,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -4782,9 +4782,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4796,9 +4796,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4810,9 +4810,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4824,9 +4824,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4838,9 +4838,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4852,9 +4852,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4866,9 +4866,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -4880,9 +4880,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -4894,9 +4894,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4908,9 +4908,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4922,9 +4922,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4936,9 +4936,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -4950,9 +4950,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4964,9 +4964,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -4978,9 +4978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4992,9 +4992,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5006,9 +5006,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5020,9 +5020,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5034,9 +5034,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5048,9 +5048,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5062,9 +5062,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5076,9 +5076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5090,9 +5090,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5104,9 +5104,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5118,9 +5118,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5132,9 +5132,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -5146,9 +5146,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5160,9 +5160,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5174,9 +5174,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5188,9 +5188,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -5202,9 +5202,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -5216,9 +5216,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5230,9 +5230,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5244,9 +5244,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5258,9 +5258,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -5272,9 +5272,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5286,9 +5286,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5300,9 +5300,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5314,9 +5314,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5328,9 +5328,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -5342,9 +5342,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5356,9 +5356,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5370,9 +5370,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5384,9 +5384,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5398,9 +5398,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -5412,9 +5412,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5426,9 +5426,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5440,9 +5440,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5454,9 +5454,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5468,9 +5468,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5482,9 +5482,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5496,9 +5496,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5510,9 +5510,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -5524,9 +5524,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5538,9 +5538,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5552,9 +5552,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -5566,9 +5566,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -5580,9 +5580,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5594,9 +5594,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5608,9 +5608,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5622,9 +5622,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -5636,9 +5636,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -5650,9 +5650,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5664,9 +5664,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5678,9 +5678,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -5692,9 +5692,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5706,9 +5706,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5720,9 +5720,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5734,9 +5734,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5748,9 +5748,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5762,9 +5762,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -5776,9 +5776,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -5790,9 +5790,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -5804,9 +5804,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5818,9 +5818,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5832,9 +5832,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -5846,9 +5846,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5860,9 +5860,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5874,9 +5874,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5888,9 +5888,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -5902,9 +5902,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5916,9 +5916,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5930,9 +5930,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5944,9 +5944,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -5958,9 +5958,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -5972,9 +5972,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5986,9 +5986,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -6000,9 +6000,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6014,9 +6014,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6028,9 +6028,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -6042,9 +6042,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6056,9 +6056,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6070,9 +6070,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6084,9 +6084,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6098,9 +6098,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6112,9 +6112,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6126,9 +6126,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6140,9 +6140,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6154,9 +6154,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6168,9 +6168,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6182,9 +6182,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6196,9 +6196,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6210,9 +6210,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -6224,9 +6224,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6238,9 +6238,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6252,9 +6252,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -6266,9 +6266,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6280,9 +6280,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6294,9 +6294,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -6308,9 +6308,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6322,9 +6322,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6336,9 +6336,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6350,9 +6350,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6364,9 +6364,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6378,9 +6378,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -6392,9 +6392,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6406,9 +6406,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6420,9 +6420,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6434,9 +6434,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -6448,9 +6448,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6462,9 +6462,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6476,9 +6476,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6490,9 +6490,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -6504,9 +6504,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6518,9 +6518,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6532,9 +6532,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -6546,9 +6546,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6560,9 +6560,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -6574,9 +6574,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6588,9 +6588,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6602,9 +6602,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6616,9 +6616,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6630,9 +6630,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6644,9 +6644,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -6658,9 +6658,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6672,9 +6672,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6686,9 +6686,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6700,9 +6700,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -6714,9 +6714,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6728,9 +6728,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6742,9 +6742,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -6756,9 +6756,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6770,9 +6770,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6784,9 +6784,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6798,9 +6798,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -6812,9 +6812,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6826,9 +6826,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6840,9 +6840,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6854,9 +6854,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6868,9 +6868,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6882,9 +6882,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -6896,9 +6896,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -6910,9 +6910,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6924,9 +6924,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6938,9 +6938,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6952,9 +6952,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -6966,9 +6966,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6980,9 +6980,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -6994,9 +6994,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7008,9 +7008,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7022,9 +7022,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7036,9 +7036,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -7050,9 +7050,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7064,9 +7064,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7078,9 +7078,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7092,9 +7092,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7106,9 +7106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -7120,9 +7120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7134,9 +7134,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -7148,9 +7148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7162,9 +7162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7176,9 +7176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7190,9 +7190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7204,9 +7204,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7218,9 +7218,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7232,9 +7232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7246,9 +7246,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -7260,9 +7260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7274,9 +7274,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7288,9 +7288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7302,9 +7302,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -7316,9 +7316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7330,9 +7330,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7344,9 +7344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7358,9 +7358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7372,9 +7372,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -7386,9 +7386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7400,9 +7400,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7414,9 +7414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7428,9 +7428,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7442,9 +7442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7456,9 +7456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7470,9 +7470,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7484,9 +7484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7498,9 +7498,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -7512,9 +7512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7526,9 +7526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7540,9 +7540,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -7554,9 +7554,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -7568,9 +7568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7582,9 +7582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7596,9 +7596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7610,9 +7610,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -7624,9 +7624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7638,9 +7638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7652,9 +7652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -7666,9 +7666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7680,9 +7680,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7694,9 +7694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7708,9 +7708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7722,9 +7722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7736,9 +7736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7750,9 +7750,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7764,9 +7764,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7778,9 +7778,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -7792,9 +7792,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7806,9 +7806,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7820,9 +7820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7834,9 +7834,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7848,9 +7848,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7862,9 +7862,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7876,9 +7876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7890,9 +7890,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -7904,9 +7904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7918,9 +7918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7932,9 +7932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -7946,9 +7946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7960,9 +7960,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7974,9 +7974,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -7988,9 +7988,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8002,9 +8002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8016,9 +8016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8030,9 +8030,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8044,9 +8044,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8058,9 +8058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8072,9 +8072,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8086,9 +8086,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8100,9 +8100,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8114,9 +8114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8128,9 +8128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -8142,9 +8142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8156,9 +8156,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8170,9 +8170,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8184,9 +8184,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8198,9 +8198,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -8212,9 +8212,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8226,9 +8226,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8240,9 +8240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8254,9 +8254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8268,9 +8268,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -8282,9 +8282,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -8296,9 +8296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8310,9 +8310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8324,9 +8324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8338,9 +8338,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8352,9 +8352,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8366,9 +8366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8380,9 +8380,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8394,9 +8394,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8408,9 +8408,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -8422,9 +8422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8436,9 +8436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8450,9 +8450,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8464,9 +8464,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8478,9 +8478,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -8492,9 +8492,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -8506,9 +8506,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -8520,9 +8520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8534,9 +8534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8548,9 +8548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8562,9 +8562,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -8576,9 +8576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8590,9 +8590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8604,9 +8604,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8618,9 +8618,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -8632,9 +8632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8646,9 +8646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8660,9 +8660,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8674,9 +8674,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8688,9 +8688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8702,9 +8702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.media: #0451A5", "hc_black": "support.constant.media: #CE9178", - "dark_plus_experimental": "support.constant.media: #CE9178", + "dark_modern": "support.constant.media: #CE9178", "hc_light": "support.constant.media: #0451A5", - "light_plus_experimental": "support.constant.media: #0451A5" + "light_modern": "support.constant.media: #0451A5" } }, { @@ -8716,9 +8716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8730,9 +8730,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8744,9 +8744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8758,9 +8758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8772,9 +8772,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -8786,9 +8786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8800,9 +8800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8814,9 +8814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -8828,9 +8828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8842,9 +8842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8856,9 +8856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8870,9 +8870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8884,9 +8884,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -8898,9 +8898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8912,9 +8912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8926,9 +8926,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8940,9 +8940,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -8954,9 +8954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8968,9 +8968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8982,9 +8982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8996,9 +8996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9010,9 +9010,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -9024,9 +9024,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -9038,9 +9038,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -9052,9 +9052,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9066,9 +9066,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9080,9 +9080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9094,9 +9094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9108,9 +9108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9122,9 +9122,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9136,9 +9136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9150,9 +9150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9164,9 +9164,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9178,9 +9178,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -9192,9 +9192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9206,9 +9206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -9220,9 +9220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -9234,9 +9234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9248,9 +9248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9262,9 +9262,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9276,9 +9276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9290,9 +9290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9304,9 +9304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -9318,9 +9318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -9332,9 +9332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9346,9 +9346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9360,9 +9360,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9374,9 +9374,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9388,9 +9388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9402,9 +9402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9416,9 +9416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9430,9 +9430,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -9444,9 +9444,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -9458,9 +9458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9472,9 +9472,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9486,9 +9486,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -9500,9 +9500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9514,9 +9514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9528,9 +9528,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9542,9 +9542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9556,9 +9556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9570,9 +9570,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9584,9 +9584,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -9598,9 +9598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9612,9 +9612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9626,9 +9626,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -9640,9 +9640,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -9654,9 +9654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9668,9 +9668,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -9682,9 +9682,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -9696,9 +9696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9710,9 +9710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9724,9 +9724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9738,9 +9738,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9752,9 +9752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9766,9 +9766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9780,9 +9780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -9794,9 +9794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9808,9 +9808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9822,9 +9822,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9836,9 +9836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9850,9 +9850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9864,9 +9864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -9878,9 +9878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9892,9 +9892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9906,9 +9906,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -9920,9 +9920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9934,9 +9934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9948,9 +9948,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9962,9 +9962,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -9976,9 +9976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9990,9 +9990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10004,9 +10004,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -10018,9 +10018,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -10032,9 +10032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10046,9 +10046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10060,9 +10060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10074,9 +10074,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10088,9 +10088,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10102,9 +10102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10116,9 +10116,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -10130,9 +10130,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -10144,9 +10144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10158,9 +10158,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -10172,9 +10172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10186,9 +10186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10200,9 +10200,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -10214,9 +10214,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -10228,9 +10228,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -10242,9 +10242,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10256,9 +10256,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10270,9 +10270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10284,9 +10284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10298,9 +10298,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10312,9 +10312,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10326,9 +10326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10340,9 +10340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -10354,9 +10354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10368,9 +10368,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -10382,9 +10382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10396,9 +10396,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -10410,9 +10410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10424,9 +10424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10438,9 +10438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10452,9 +10452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10466,9 +10466,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10480,9 +10480,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10494,9 +10494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10508,9 +10508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -10522,9 +10522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10536,9 +10536,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -10550,9 +10550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10564,9 +10564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10578,9 +10578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10592,9 +10592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10606,9 +10606,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10620,9 +10620,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10634,9 +10634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10648,9 +10648,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10662,9 +10662,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10676,9 +10676,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10690,9 +10690,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -10704,9 +10704,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10718,9 +10718,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10732,9 +10732,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -10746,9 +10746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10760,9 +10760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10774,9 +10774,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -10788,9 +10788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10802,9 +10802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10816,9 +10816,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10830,9 +10830,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -10844,9 +10844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10858,9 +10858,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10872,9 +10872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10886,9 +10886,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -10900,9 +10900,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10914,9 +10914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10928,9 +10928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10942,9 +10942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10956,9 +10956,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10970,9 +10970,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10984,9 +10984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10998,9 +10998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -11012,9 +11012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11026,9 +11026,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -11040,9 +11040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11054,9 +11054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11068,9 +11068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11082,9 +11082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11096,9 +11096,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -11110,9 +11110,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -11124,9 +11124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11138,9 +11138,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -11152,9 +11152,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -11166,9 +11166,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11180,9 +11180,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -11194,9 +11194,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11208,9 +11208,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -11222,9 +11222,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -11236,9 +11236,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11250,9 +11250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11264,9 +11264,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -11278,9 +11278,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11292,9 +11292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11306,9 +11306,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11320,9 +11320,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -11334,9 +11334,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11348,9 +11348,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11362,9 +11362,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11376,9 +11376,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -11390,9 +11390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11404,9 +11404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11418,9 +11418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11432,9 +11432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11446,9 +11446,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -11460,9 +11460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11474,9 +11474,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11488,9 +11488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -11502,9 +11502,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11516,9 +11516,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11530,9 +11530,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -11544,9 +11544,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11558,9 +11558,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11572,9 +11572,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -11586,9 +11586,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11600,9 +11600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11614,9 +11614,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -11628,9 +11628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11642,9 +11642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11656,9 +11656,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -11670,9 +11670,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11684,9 +11684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11698,9 +11698,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -11712,9 +11712,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -11726,9 +11726,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -11740,9 +11740,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -11754,9 +11754,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -11768,9 +11768,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -11782,9 +11782,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -11796,9 +11796,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11810,9 +11810,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11824,9 +11824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11838,9 +11838,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -11852,9 +11852,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -11866,9 +11866,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11880,9 +11880,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11894,9 +11894,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11908,9 +11908,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11922,9 +11922,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11936,9 +11936,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11950,9 +11950,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11964,9 +11964,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11978,9 +11978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11992,9 +11992,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12006,9 +12006,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12020,9 +12020,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12034,9 +12034,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12048,9 +12048,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -12062,9 +12062,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12076,9 +12076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12090,9 +12090,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12104,9 +12104,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -12118,9 +12118,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12132,9 +12132,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -12146,9 +12146,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12160,9 +12160,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12174,9 +12174,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12188,9 +12188,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12202,9 +12202,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -12216,9 +12216,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -12230,9 +12230,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12244,9 +12244,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12258,9 +12258,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12272,9 +12272,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12286,9 +12286,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12300,9 +12300,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12314,9 +12314,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12328,9 +12328,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12342,9 +12342,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12356,9 +12356,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -12370,9 +12370,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12384,9 +12384,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12398,9 +12398,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12412,9 +12412,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -12426,9 +12426,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12440,9 +12440,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -12454,9 +12454,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12468,9 +12468,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12482,9 +12482,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12496,9 +12496,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12510,9 +12510,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -12524,9 +12524,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -12538,9 +12538,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12552,9 +12552,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12566,9 +12566,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12580,9 +12580,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -12594,9 +12594,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12608,9 +12608,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12622,9 +12622,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12636,9 +12636,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -12650,9 +12650,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12664,9 +12664,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -12678,9 +12678,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12692,9 +12692,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12706,9 +12706,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12720,9 +12720,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12734,9 +12734,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -12748,9 +12748,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -12762,9 +12762,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -12776,9 +12776,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -12790,9 +12790,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12804,9 +12804,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12818,9 +12818,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12832,9 +12832,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -12846,9 +12846,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12860,9 +12860,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12874,9 +12874,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12888,9 +12888,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -12902,9 +12902,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -12916,9 +12916,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12930,9 +12930,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -12944,9 +12944,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12958,9 +12958,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12972,9 +12972,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12986,9 +12986,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13000,9 +13000,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13014,9 +13014,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -13028,9 +13028,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13042,9 +13042,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13056,9 +13056,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -13070,9 +13070,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13084,9 +13084,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13098,9 +13098,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13112,9 +13112,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13126,9 +13126,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -13140,9 +13140,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -13154,9 +13154,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13168,9 +13168,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13182,9 +13182,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -13196,9 +13196,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13210,9 +13210,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13224,9 +13224,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -13238,9 +13238,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13252,9 +13252,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13266,9 +13266,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13280,9 +13280,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13294,9 +13294,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -13308,9 +13308,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -13322,9 +13322,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -13336,9 +13336,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -13350,9 +13350,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -13364,9 +13364,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13378,9 +13378,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -13392,9 +13392,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13406,9 +13406,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -13420,9 +13420,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13434,9 +13434,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13448,9 +13448,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13462,9 +13462,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -13476,9 +13476,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13490,9 +13490,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13504,9 +13504,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13518,9 +13518,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13532,9 +13532,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13546,9 +13546,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -13560,9 +13560,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -13574,9 +13574,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13588,9 +13588,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -13602,9 +13602,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13616,9 +13616,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13630,9 +13630,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13644,9 +13644,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13658,9 +13658,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -13672,9 +13672,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13686,9 +13686,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13700,9 +13700,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -13714,9 +13714,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -13728,9 +13728,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13742,9 +13742,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13756,9 +13756,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13770,9 +13770,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -13784,9 +13784,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13798,9 +13798,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13812,9 +13812,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13826,9 +13826,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13840,9 +13840,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -13854,9 +13854,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -13868,9 +13868,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -13882,9 +13882,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -13896,9 +13896,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -13910,9 +13910,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13924,9 +13924,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -13938,9 +13938,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13952,9 +13952,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -13966,9 +13966,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13980,9 +13980,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -13994,9 +13994,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14008,9 +14008,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14022,9 +14022,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14036,9 +14036,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -14050,9 +14050,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14064,9 +14064,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -14078,9 +14078,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14092,9 +14092,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -14106,9 +14106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14120,9 +14120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14134,9 +14134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14148,9 +14148,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -14162,9 +14162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14176,9 +14176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14190,9 +14190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -14204,9 +14204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14218,9 +14218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -14232,9 +14232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -14246,9 +14246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14260,9 +14260,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -14274,9 +14274,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14288,9 +14288,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -14302,9 +14302,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -14316,9 +14316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14330,9 +14330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14344,9 +14344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14358,9 +14358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14372,9 +14372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14386,9 +14386,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -14400,9 +14400,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -14414,9 +14414,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -14428,9 +14428,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -14442,9 +14442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14456,9 +14456,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -14470,9 +14470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14484,9 +14484,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -14498,9 +14498,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -14512,9 +14512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14526,9 +14526,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -14540,9 +14540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14554,9 +14554,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -14568,9 +14568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14582,9 +14582,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -14596,9 +14596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14610,9 +14610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14624,9 +14624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14638,9 +14638,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -14652,9 +14652,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -14666,9 +14666,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14680,9 +14680,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -14694,9 +14694,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14708,9 +14708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14722,9 +14722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14736,9 +14736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14750,9 +14750,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -14764,9 +14764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14778,9 +14778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14792,9 +14792,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -14806,9 +14806,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -14820,9 +14820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14834,9 +14834,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -14848,9 +14848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14862,9 +14862,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -14876,9 +14876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14890,9 +14890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14904,9 +14904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14918,9 +14918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14932,9 +14932,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -14946,9 +14946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14960,9 +14960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14974,9 +14974,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -14988,9 +14988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15002,9 +15002,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -15016,9 +15016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15030,9 +15030,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -15044,9 +15044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15058,9 +15058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15072,9 +15072,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -15086,9 +15086,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -15100,9 +15100,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -15114,9 +15114,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -15128,9 +15128,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -15142,9 +15142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15156,9 +15156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -15170,9 +15170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15184,9 +15184,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -15198,9 +15198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15212,9 +15212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15226,9 +15226,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -15240,9 +15240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15254,9 +15254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15268,9 +15268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15282,9 +15282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15296,9 +15296,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -15310,9 +15310,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -15324,9 +15324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15338,9 +15338,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -15352,9 +15352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15366,9 +15366,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -15380,9 +15380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15394,9 +15394,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -15408,9 +15408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15422,9 +15422,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -15436,9 +15436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15450,9 +15450,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -15464,9 +15464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15478,9 +15478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15492,9 +15492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15506,9 +15506,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -15520,9 +15520,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -15534,9 +15534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15548,9 +15548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15562,9 +15562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -15576,9 +15576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15590,9 +15590,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -15604,9 +15604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15618,9 +15618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15632,9 +15632,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -15646,9 +15646,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -15660,9 +15660,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -15674,9 +15674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15688,9 +15688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15702,9 +15702,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -15716,9 +15716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15730,9 +15730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15744,9 +15744,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -15758,9 +15758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15772,9 +15772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15786,9 +15786,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -15800,9 +15800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15814,9 +15814,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -15828,9 +15828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15842,9 +15842,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -15856,9 +15856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15870,9 +15870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15884,9 +15884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15898,9 +15898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15912,9 +15912,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -15926,9 +15926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15940,9 +15940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15954,9 +15954,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -15968,9 +15968,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -15982,9 +15982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -15996,9 +15996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16010,9 +16010,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -16024,9 +16024,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -16038,9 +16038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16052,9 +16052,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -16066,9 +16066,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -16080,9 +16080,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -16094,9 +16094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16108,9 +16108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16122,9 +16122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16136,9 +16136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16150,9 +16150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16164,9 +16164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16178,9 +16178,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -16192,9 +16192,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -16206,9 +16206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16220,9 +16220,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -16234,9 +16234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16248,9 +16248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16262,9 +16262,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -16276,9 +16276,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -16290,9 +16290,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -16304,9 +16304,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -16318,9 +16318,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -16332,9 +16332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16346,9 +16346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -16360,9 +16360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16374,9 +16374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16388,9 +16388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16402,9 +16402,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -16416,9 +16416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16430,9 +16430,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16444,9 +16444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16458,9 +16458,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -16472,9 +16472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16486,9 +16486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16500,9 +16500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.font-name: #0451A5", "hc_black": "support.constant.font-name: #CE9178", - "dark_plus_experimental": "support.constant.font-name: #CE9178", + "dark_modern": "support.constant.font-name: #CE9178", "hc_light": "support.constant.font-name: #0451A5", - "light_plus_experimental": "support.constant.font-name: #0451A5" + "light_modern": "support.constant.font-name: #0451A5" } }, { @@ -16514,9 +16514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16528,9 +16528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16542,9 +16542,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -16556,9 +16556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16570,9 +16570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16584,9 +16584,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -16598,9 +16598,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -16612,9 +16612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16626,9 +16626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16640,9 +16640,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -16654,9 +16654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16668,9 +16668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16682,9 +16682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -16696,9 +16696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16710,9 +16710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16724,9 +16724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16738,9 +16738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16752,9 +16752,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -16766,9 +16766,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16780,9 +16780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16794,9 +16794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -16808,9 +16808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -16822,9 +16822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16836,9 +16836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16850,9 +16850,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -16864,9 +16864,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -16878,9 +16878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16892,9 +16892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16906,9 +16906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16920,9 +16920,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -16934,9 +16934,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -16948,9 +16948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16962,9 +16962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -16976,9 +16976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -16990,9 +16990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17004,9 +17004,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -17018,9 +17018,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17032,9 +17032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17046,9 +17046,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -17060,9 +17060,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -17074,9 +17074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17088,9 +17088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17102,9 +17102,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -17116,9 +17116,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -17130,9 +17130,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -17144,9 +17144,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -17158,9 +17158,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -17172,9 +17172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17186,9 +17186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -17200,9 +17200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17214,9 +17214,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -17228,9 +17228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17242,9 +17242,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -17256,9 +17256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17270,9 +17270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17284,9 +17284,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -17298,9 +17298,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -17312,9 +17312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17326,9 +17326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17340,9 +17340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17354,9 +17354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17368,9 +17368,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -17382,9 +17382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17396,9 +17396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17410,9 +17410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17424,9 +17424,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -17438,9 +17438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17452,9 +17452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17466,9 +17466,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -17480,9 +17480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17494,9 +17494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17508,9 +17508,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -17522,9 +17522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17536,9 +17536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17550,9 +17550,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -17564,9 +17564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17578,9 +17578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17592,9 +17592,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -17606,9 +17606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17620,9 +17620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17634,9 +17634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -17648,9 +17648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17662,9 +17662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17676,9 +17676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17690,9 +17690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17704,9 +17704,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -17718,9 +17718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17732,9 +17732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17746,9 +17746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17760,9 +17760,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -17774,9 +17774,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -17788,9 +17788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17802,9 +17802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -17816,9 +17816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17830,9 +17830,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -17844,9 +17844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17858,9 +17858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17872,9 +17872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17886,9 +17886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17900,9 +17900,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -17914,9 +17914,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -17928,9 +17928,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -17942,9 +17942,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -17956,9 +17956,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -17970,9 +17970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -17984,9 +17984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -17998,9 +17998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18012,9 +18012,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -18026,9 +18026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18040,9 +18040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18054,9 +18054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18068,9 +18068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18082,9 +18082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18096,9 +18096,9 @@ "dark_vs": "support.type.vendored.property-name: #9CDCFE", "light_vs": "support.type.vendored.property-name: #E50000", "hc_black": "support.type.vendored.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.vendored.property-name: #9CDCFE", + "dark_modern": "support.type.vendored.property-name: #9CDCFE", "hc_light": "support.type.vendored.property-name: #264F78", - "light_plus_experimental": "support.type.vendored.property-name: #E50000" + "light_modern": "support.type.vendored.property-name: #E50000" } }, { @@ -18110,9 +18110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18124,9 +18124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18138,9 +18138,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -18152,9 +18152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18166,9 +18166,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18180,9 +18180,9 @@ "dark_vs": "support.type.vendored.property-name: #9CDCFE", "light_vs": "support.type.vendored.property-name: #E50000", "hc_black": "support.type.vendored.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.vendored.property-name: #9CDCFE", + "dark_modern": "support.type.vendored.property-name: #9CDCFE", "hc_light": "support.type.vendored.property-name: #264F78", - "light_plus_experimental": "support.type.vendored.property-name: #E50000" + "light_modern": "support.type.vendored.property-name: #E50000" } }, { @@ -18194,9 +18194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18208,9 +18208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18222,9 +18222,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -18236,9 +18236,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18250,9 +18250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18264,9 +18264,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -18278,9 +18278,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18292,9 +18292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18306,9 +18306,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -18320,9 +18320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18334,9 +18334,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18348,9 +18348,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -18362,9 +18362,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -18376,9 +18376,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18390,9 +18390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18404,9 +18404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18418,9 +18418,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -18432,9 +18432,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -18446,9 +18446,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18460,9 +18460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -18474,9 +18474,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18488,9 +18488,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -18502,9 +18502,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -18516,9 +18516,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18530,9 +18530,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -18544,9 +18544,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -18558,9 +18558,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18572,9 +18572,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -18586,9 +18586,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -18600,9 +18600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18614,9 +18614,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -18628,9 +18628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -18642,9 +18642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18656,9 +18656,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -18670,9 +18670,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -18684,9 +18684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18698,9 +18698,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -18712,9 +18712,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -18726,9 +18726,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18740,9 +18740,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -18754,9 +18754,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -18768,9 +18768,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18782,9 +18782,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -18796,9 +18796,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -18810,9 +18810,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18824,9 +18824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18838,9 +18838,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18852,9 +18852,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -18866,9 +18866,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -18880,9 +18880,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -18894,9 +18894,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -18908,9 +18908,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -18922,9 +18922,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18936,9 +18936,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -18950,9 +18950,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18964,9 +18964,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -18978,9 +18978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -18992,9 +18992,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -19006,9 +19006,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19020,9 +19020,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -19034,9 +19034,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19048,9 +19048,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19062,9 +19062,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19076,9 +19076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19090,9 +19090,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -19104,9 +19104,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19118,9 +19118,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19132,9 +19132,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -19146,9 +19146,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19160,9 +19160,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19174,9 +19174,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -19188,9 +19188,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19202,9 +19202,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19216,9 +19216,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -19230,9 +19230,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19244,9 +19244,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19258,9 +19258,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -19272,9 +19272,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19286,9 +19286,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19300,9 +19300,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -19314,9 +19314,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19328,9 +19328,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19342,9 +19342,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -19356,9 +19356,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19370,9 +19370,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -19384,9 +19384,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -19398,9 +19398,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19412,9 +19412,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -19426,9 +19426,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -19440,9 +19440,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19454,9 +19454,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -19468,9 +19468,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -19482,9 +19482,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19496,9 +19496,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -19510,9 +19510,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -19524,9 +19524,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19538,9 +19538,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19552,9 +19552,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19566,9 +19566,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -19580,9 +19580,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -19594,9 +19594,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19608,9 +19608,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -19622,9 +19622,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19636,9 +19636,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -19650,9 +19650,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19664,9 +19664,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19678,9 +19678,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19692,9 +19692,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19706,9 +19706,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -19720,9 +19720,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -19734,9 +19734,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -19748,9 +19748,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -19762,9 +19762,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -19776,9 +19776,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19790,9 +19790,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -19804,9 +19804,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19818,9 +19818,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19832,9 +19832,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19846,9 +19846,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -19860,9 +19860,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19874,9 +19874,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -19888,9 +19888,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19902,9 +19902,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19916,9 +19916,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19930,9 +19930,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -19944,9 +19944,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19958,9 +19958,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19972,9 +19972,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -19986,9 +19986,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20000,9 +20000,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -20014,9 +20014,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -20028,9 +20028,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20042,9 +20042,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -20056,9 +20056,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20070,9 +20070,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20084,9 +20084,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20098,9 +20098,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -20112,9 +20112,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -20126,9 +20126,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20140,9 +20140,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20154,9 +20154,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20168,9 +20168,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -20182,9 +20182,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20196,9 +20196,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20210,9 +20210,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -20224,9 +20224,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20238,9 +20238,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -20252,9 +20252,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -20266,9 +20266,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20280,9 +20280,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20294,9 +20294,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20308,9 +20308,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20322,9 +20322,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20336,9 +20336,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -20350,9 +20350,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -20364,9 +20364,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20378,9 +20378,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -20392,9 +20392,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20406,9 +20406,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20420,9 +20420,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20434,9 +20434,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -20448,9 +20448,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -20462,9 +20462,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20476,9 +20476,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -20490,9 +20490,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20504,9 +20504,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20518,9 +20518,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20532,9 +20532,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20546,9 +20546,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20560,9 +20560,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -20574,9 +20574,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -20588,9 +20588,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -20602,9 +20602,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20616,9 +20616,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -20630,9 +20630,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -20644,9 +20644,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -20658,9 +20658,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20672,9 +20672,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -20686,9 +20686,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20700,9 +20700,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-element.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-element.css: #800000" } }, { @@ -20714,9 +20714,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-element.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-element.css: #800000" } }, { @@ -20728,9 +20728,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20742,9 +20742,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20756,9 +20756,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20770,9 +20770,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -20784,9 +20784,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20798,9 +20798,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20812,9 +20812,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -20826,9 +20826,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -20840,9 +20840,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -20854,9 +20854,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20868,9 +20868,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20882,9 +20882,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -20896,9 +20896,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -20910,9 +20910,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -20924,9 +20924,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -20938,9 +20938,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -20952,9 +20952,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20966,9 +20966,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -20980,9 +20980,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -20994,9 +20994,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21008,9 +21008,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21022,9 +21022,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -21036,9 +21036,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21050,9 +21050,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21064,9 +21064,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -21078,9 +21078,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -21092,9 +21092,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21106,9 +21106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21120,9 +21120,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -21134,9 +21134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21148,9 +21148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21162,9 +21162,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -21176,9 +21176,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -21190,9 +21190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21204,9 +21204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21218,9 +21218,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -21232,9 +21232,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -21246,9 +21246,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -21260,9 +21260,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -21274,9 +21274,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -21288,9 +21288,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -21302,9 +21302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21316,9 +21316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21330,9 +21330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21344,9 +21344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21358,9 +21358,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -21372,9 +21372,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -21386,9 +21386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21400,9 +21400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21414,9 +21414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21428,9 +21428,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -21442,9 +21442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21456,9 +21456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21470,9 +21470,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -21484,9 +21484,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -21498,9 +21498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21512,9 +21512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21526,9 +21526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21540,9 +21540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21554,9 +21554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21568,9 +21568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21582,9 +21582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21596,9 +21596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21610,9 +21610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21624,9 +21624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21638,9 +21638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21652,9 +21652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -21666,9 +21666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21680,9 +21680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21694,9 +21694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21708,9 +21708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21722,9 +21722,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -21736,9 +21736,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -21750,9 +21750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21764,9 +21764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21778,9 +21778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21792,9 +21792,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -21806,9 +21806,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -21820,9 +21820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21834,9 +21834,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -21848,9 +21848,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -21862,9 +21862,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -21876,9 +21876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21890,9 +21890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21904,9 +21904,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -21918,9 +21918,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -21932,9 +21932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21946,9 +21946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -21960,9 +21960,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -21974,9 +21974,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -21988,9 +21988,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -22002,9 +22002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22016,9 +22016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22030,9 +22030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.color: #0451A5", "hc_black": "support.constant.color: #CE9178", - "dark_plus_experimental": "support.constant.color: #CE9178", + "dark_modern": "support.constant.color: #CE9178", "hc_light": "support.constant.color: #0451A5", - "light_plus_experimental": "support.constant.color: #0451A5" + "light_modern": "support.constant.color: #0451A5" } }, { @@ -22044,9 +22044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22058,9 +22058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22072,9 +22072,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -22086,9 +22086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22100,9 +22100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "support.constant.property-value: #0451A5", "hc_black": "support.constant.property-value: #CE9178", - "dark_plus_experimental": "support.constant.property-value: #CE9178", + "dark_modern": "support.constant.property-value: #CE9178", "hc_light": "support.constant.property-value: #0451A5", - "light_plus_experimental": "support.constant.property-value: #0451A5" + "light_modern": "support.constant.property-value: #0451A5" } }, { @@ -22114,9 +22114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22128,9 +22128,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -22142,9 +22142,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -22156,9 +22156,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -22170,9 +22170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22184,9 +22184,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -22198,9 +22198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22212,9 +22212,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -22226,9 +22226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22240,9 +22240,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -22254,9 +22254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22268,9 +22268,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -22282,9 +22282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22296,9 +22296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -22310,9 +22310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "constant.other.color.rgb-value: #0451A5", "hc_black": "constant.other.color.rgb-value: #CE9178", - "dark_plus_experimental": "constant.other.color.rgb-value: #CE9178", + "dark_modern": "constant.other.color.rgb-value: #CE9178", "hc_light": "constant.other.color.rgb-value: #0451A5", - "light_plus_experimental": "constant.other.color.rgb-value: #0451A5" + "light_modern": "constant.other.color.rgb-value: #0451A5" } }, { @@ -22324,9 +22324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22338,9 +22338,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -22352,9 +22352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22366,9 +22366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -22380,9 +22380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22394,9 +22394,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -22408,9 +22408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22422,9 +22422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22436,9 +22436,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22450,9 +22450,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22464,9 +22464,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22478,9 +22478,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22492,9 +22492,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22506,9 +22506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22520,9 +22520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -22534,9 +22534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22548,9 +22548,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -22562,9 +22562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22576,9 +22576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22590,9 +22590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22604,9 +22604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22618,9 +22618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22632,9 +22632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22646,9 +22646,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22660,9 +22660,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22674,9 +22674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22688,9 +22688,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -22702,9 +22702,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -22716,9 +22716,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -22730,9 +22730,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -22744,9 +22744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22758,9 +22758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22772,9 +22772,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22786,9 +22786,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22800,9 +22800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22814,9 +22814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -22828,9 +22828,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -22842,9 +22842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -22856,9 +22856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22870,9 +22870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22884,9 +22884,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -22898,9 +22898,9 @@ "dark_vs": "entity.other.attribute-name.id.css: #D7BA7D", "light_vs": "entity.other.attribute-name.id.css: #800000", "hc_black": "entity.other.attribute-name.id.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.id.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.id.css: #D7BA7D", "hc_light": "entity.other.attribute-name.id.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.id.css: #800000" + "light_modern": "entity.other.attribute-name.id.css: #800000" } }, { @@ -22912,9 +22912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22926,9 +22926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22940,9 +22940,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -22954,9 +22954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22968,9 +22968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22982,9 +22982,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -22996,9 +22996,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -23010,9 +23010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23024,9 +23024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23038,9 +23038,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -23052,9 +23052,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -23066,9 +23066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23080,9 +23080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23094,9 +23094,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -23108,9 +23108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23122,9 +23122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23136,9 +23136,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -23150,9 +23150,9 @@ "dark_vs": "keyword.other.unit: #B5CEA8", "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8", - "dark_plus_experimental": "keyword.other.unit: #B5CEA8", + "dark_modern": "keyword.other.unit: #B5CEA8", "hc_light": "keyword.other.unit: #096D48", - "light_plus_experimental": "keyword.other.unit: #098658" + "light_modern": "keyword.other.unit: #098658" } }, { @@ -23164,9 +23164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23178,9 +23178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23192,9 +23192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23206,9 +23206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23220,9 +23220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23234,9 +23234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23248,9 +23248,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -23262,9 +23262,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -23276,9 +23276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23290,9 +23290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -23304,9 +23304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23318,9 +23318,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -23332,9 +23332,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -23346,9 +23346,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -23360,9 +23360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23374,9 +23374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23388,9 +23388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23402,9 +23402,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -23416,9 +23416,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -23430,9 +23430,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -23444,9 +23444,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -23458,9 +23458,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -23472,9 +23472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23486,9 +23486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23500,9 +23500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23514,9 +23514,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -23528,9 +23528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23542,9 +23542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23556,9 +23556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23570,9 +23570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23584,9 +23584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23598,9 +23598,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -23612,9 +23612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23626,9 +23626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23640,9 +23640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -23654,9 +23654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23668,9 +23668,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -23682,9 +23682,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -23696,9 +23696,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -23710,9 +23710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23724,9 +23724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23738,9 +23738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23752,9 +23752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23766,9 +23766,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -23780,9 +23780,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -23794,9 +23794,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -23808,9 +23808,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -23822,9 +23822,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -23836,9 +23836,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -23850,9 +23850,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -23864,9 +23864,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -23878,9 +23878,9 @@ "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", "light_vs": "entity.other.attribute-name.class.css: #800000", "hc_black": "entity.other.attribute-name.class.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.class.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.class.css: #D7BA7D", "hc_light": "entity.other.attribute-name.class.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.class.css: #800000" + "light_modern": "entity.other.attribute-name.class.css: #800000" } }, { @@ -23892,9 +23892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23906,9 +23906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23920,9 +23920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23934,9 +23934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -23948,9 +23948,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -23962,9 +23962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -23976,9 +23976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -23990,9 +23990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24004,9 +24004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24018,9 +24018,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -24032,9 +24032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24046,9 +24046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24060,9 +24060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24074,9 +24074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -24088,9 +24088,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -24102,9 +24102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -24116,9 +24116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24130,9 +24130,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24144,9 +24144,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -24158,9 +24158,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24172,9 +24172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24186,9 +24186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -24200,9 +24200,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -24214,9 +24214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -24228,9 +24228,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24242,9 +24242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -24256,9 +24256,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -24270,9 +24270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -24284,9 +24284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24298,9 +24298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24312,9 +24312,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -24326,9 +24326,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24340,9 +24340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24354,9 +24354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24368,9 +24368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -24382,9 +24382,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -24396,9 +24396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -24410,9 +24410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24424,9 +24424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24438,9 +24438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24452,9 +24452,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -24466,9 +24466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24480,9 +24480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24494,9 +24494,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -24508,9 +24508,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -24522,9 +24522,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -24536,9 +24536,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -24550,9 +24550,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -24564,9 +24564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24578,9 +24578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24592,9 +24592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24606,9 +24606,9 @@ "dark_vs": "entity.other.attribute-name.scss: #D7BA7D", "light_vs": "entity.other.attribute-name.scss: #800000", "hc_black": "entity.other.attribute-name.scss: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D", + "dark_modern": "entity.other.attribute-name.scss: #D7BA7D", "hc_light": "entity.other.attribute-name.scss: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.scss: #800000" + "light_modern": "entity.other.attribute-name.scss: #800000" } }, { @@ -24620,9 +24620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24634,9 +24634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24648,9 +24648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24662,9 +24662,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -24676,9 +24676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24690,9 +24690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24704,9 +24704,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -24718,9 +24718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24732,9 +24732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24746,9 +24746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24760,9 +24760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24774,9 +24774,9 @@ "dark_vs": "entity.other.attribute-name.scss: #D7BA7D", "light_vs": "entity.other.attribute-name.scss: #800000", "hc_black": "entity.other.attribute-name.scss: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D", + "dark_modern": "entity.other.attribute-name.scss: #D7BA7D", "hc_light": "entity.other.attribute-name.scss: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.scss: #800000" + "light_modern": "entity.other.attribute-name.scss: #800000" } }, { @@ -24788,9 +24788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24802,9 +24802,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24816,9 +24816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24830,9 +24830,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -24844,9 +24844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24858,9 +24858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24872,9 +24872,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -24886,9 +24886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24900,9 +24900,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24914,9 +24914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24928,9 +24928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24942,9 +24942,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -24956,9 +24956,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -24970,9 +24970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24984,9 +24984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -24998,9 +24998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25012,9 +25012,9 @@ "dark_vs": "entity.other.attribute-name.scss: #D7BA7D", "light_vs": "entity.other.attribute-name.scss: #800000", "hc_black": "entity.other.attribute-name.scss: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D", + "dark_modern": "entity.other.attribute-name.scss: #D7BA7D", "hc_light": "entity.other.attribute-name.scss: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.scss: #800000" + "light_modern": "entity.other.attribute-name.scss: #800000" } }, { @@ -25026,9 +25026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25040,9 +25040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25054,9 +25054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25068,9 +25068,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -25082,9 +25082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25096,9 +25096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25110,9 +25110,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -25124,9 +25124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25138,9 +25138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25152,9 +25152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25166,9 +25166,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25180,9 +25180,9 @@ "dark_vs": "entity.other.attribute-name.scss: #D7BA7D", "light_vs": "entity.other.attribute-name.scss: #800000", "hc_black": "entity.other.attribute-name.scss: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D", + "dark_modern": "entity.other.attribute-name.scss: #D7BA7D", "hc_light": "entity.other.attribute-name.scss: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.scss: #800000" + "light_modern": "entity.other.attribute-name.scss: #800000" } }, { @@ -25194,9 +25194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25208,9 +25208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25222,9 +25222,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25236,9 +25236,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -25250,9 +25250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25264,9 +25264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25278,9 +25278,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -25292,9 +25292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25306,9 +25306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25320,9 +25320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25334,9 +25334,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25348,9 +25348,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25362,9 +25362,9 @@ "dark_vs": "support.type.vendored.property-name: #9CDCFE", "light_vs": "support.type.vendored.property-name: #E50000", "hc_black": "support.type.vendored.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.vendored.property-name: #9CDCFE", + "dark_modern": "support.type.vendored.property-name: #9CDCFE", "hc_light": "support.type.vendored.property-name: #264F78", - "light_plus_experimental": "support.type.vendored.property-name: #E50000" + "light_modern": "support.type.vendored.property-name: #E50000" } }, { @@ -25376,9 +25376,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25390,9 +25390,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -25404,9 +25404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25418,9 +25418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25432,9 +25432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25446,9 +25446,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25460,9 +25460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25474,9 +25474,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -25488,9 +25488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25502,9 +25502,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25516,9 +25516,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -25530,9 +25530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25544,9 +25544,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25558,9 +25558,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25572,9 +25572,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25586,9 +25586,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25600,9 +25600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25614,9 +25614,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -25628,9 +25628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25642,9 +25642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25656,9 +25656,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -25670,9 +25670,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25684,9 +25684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25698,9 +25698,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25712,9 +25712,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25726,9 +25726,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -25740,9 +25740,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -25754,9 +25754,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25768,9 +25768,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -25782,9 +25782,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25796,9 +25796,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25810,9 +25810,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25824,9 +25824,9 @@ "dark_vs": "entity.other.attribute-name.scss: #D7BA7D", "light_vs": "entity.other.attribute-name.scss: #800000", "hc_black": "entity.other.attribute-name.scss: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D", + "dark_modern": "entity.other.attribute-name.scss: #D7BA7D", "hc_light": "entity.other.attribute-name.scss: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.scss: #800000" + "light_modern": "entity.other.attribute-name.scss: #800000" } }, { @@ -25838,9 +25838,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25852,9 +25852,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25866,9 +25866,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25880,9 +25880,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -25894,9 +25894,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25908,9 +25908,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25922,9 +25922,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -25936,9 +25936,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25950,9 +25950,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25964,9 +25964,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25978,9 +25978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -25992,9 +25992,9 @@ "dark_vs": "entity.other.attribute-name.scss: #D7BA7D", "light_vs": "entity.other.attribute-name.scss: #800000", "hc_black": "entity.other.attribute-name.scss: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.scss: #D7BA7D", + "dark_modern": "entity.other.attribute-name.scss: #D7BA7D", "hc_light": "entity.other.attribute-name.scss: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.scss: #800000" + "light_modern": "entity.other.attribute-name.scss: #800000" } }, { @@ -26006,9 +26006,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26020,9 +26020,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26034,9 +26034,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26048,9 +26048,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name: #264F78", - "light_plus_experimental": "support.type.property-name: #E50000" + "light_modern": "support.type.property-name: #E50000" } }, { @@ -26062,9 +26062,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26076,9 +26076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26090,9 +26090,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -26104,9 +26104,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26118,9 +26118,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26132,9 +26132,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26146,9 +26146,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26160,9 +26160,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -26174,9 +26174,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -26188,9 +26188,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -26202,9 +26202,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26216,9 +26216,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -26230,9 +26230,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -26244,9 +26244,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -26258,9 +26258,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26272,9 +26272,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -26286,9 +26286,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26300,9 +26300,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-element.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-element.css: #800000" } }, { @@ -26314,9 +26314,9 @@ "dark_vs": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", "light_vs": "entity.other.attribute-name.pseudo-element.css: #800000", "hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", - "dark_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", + "dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D", "hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85", - "light_plus_experimental": "entity.other.attribute-name.pseudo-element.css: #800000" + "light_modern": "entity.other.attribute-name.pseudo-element.css: #800000" } }, { @@ -26328,9 +26328,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26342,9 +26342,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26356,9 +26356,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26370,9 +26370,9 @@ "dark_vs": "entity.name.tag.css: #D7BA7D", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag.css: #D7BA7D", - "dark_plus_experimental": "entity.name.tag.css: #D7BA7D", + "dark_modern": "entity.name.tag.css: #D7BA7D", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -26384,9 +26384,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26398,9 +26398,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -26412,9 +26412,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -26426,9 +26426,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -26440,9 +26440,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26454,9 +26454,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26468,9 +26468,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -26482,9 +26482,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -26496,9 +26496,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -26510,9 +26510,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -26524,9 +26524,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26538,9 +26538,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26552,9 +26552,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -26566,9 +26566,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -26580,9 +26580,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -26594,9 +26594,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26608,9 +26608,9 @@ "dark_vs": "variable.scss: #9CDCFE", "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", - "dark_plus_experimental": "variable.scss: #9CDCFE", + "dark_modern": "variable.scss: #9CDCFE", "hc_light": "variable.scss: #264F78", - "light_plus_experimental": "variable.scss: #E50000" + "light_modern": "variable.scss: #E50000" } }, { @@ -26622,9 +26622,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26636,9 +26636,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26650,9 +26650,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -26664,9 +26664,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -26678,9 +26678,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -26692,9 +26692,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -26706,9 +26706,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -26720,9 +26720,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -26734,9 +26734,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json index 0a0f0b4d050..b725f8255df 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -106,9 +106,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -120,9 +120,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -232,9 +232,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -652,9 +652,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -666,9 +666,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -680,9 +680,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -778,9 +778,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -792,9 +792,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -806,9 +806,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -820,9 +820,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -834,9 +834,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -848,9 +848,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -862,9 +862,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -890,9 +890,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -904,9 +904,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -918,9 +918,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "constant.other.option: #569CD6", + "dark_modern": "constant.other.option: #569CD6", "hc_light": "string: #0F4A85", - "light_plus_experimental": "constant.other.option: #0000FF" + "light_modern": "constant.other.option: #0000FF" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_shader.json b/extensions/vscode-colorize-tests/test/colorize-results/test_shader.json index 90e6e94983a..7221ff4e3dd 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_shader.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_shader.json @@ -8,9 +8,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -232,9 +232,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.variable: #9CDCFE", - "dark_plus_experimental": "support.variable: #9CDCFE", + "dark_modern": "support.variable: #9CDCFE", "hc_light": "support.variable: #001080", - "light_plus_experimental": "support.variable: #001080" + "light_modern": "support.variable: #001080" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_sql.json b/extensions/vscode-colorize-tests/test/colorize-results/test_sql.json index 393a6d72e4c..6c6cc4c26eb 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_sql.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sql.json @@ -8,9 +8,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -442,9 +442,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_sty.json b/extensions/vscode-colorize-tests/test/colorize-results/test_sty.json index 809e8a84f48..13d83201f14 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_sty.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sty.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6", - "dark_plus_experimental": "constant.character.escape: #D7BA7D", + "dark_modern": "constant.character.escape: #D7BA7D", "hc_light": "constant.character.escape: #EE0000", - "light_plus_experimental": "constant.character.escape: #EE0000" + "light_modern": "constant.character.escape: #EE0000" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json b/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json index cdbbedbfc32..8b1b64f71f5 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json @@ -8,9 +8,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -78,9 +78,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -148,9 +148,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword: #569CD6", "light_vs": "keyword: #0000FF", "hc_black": "keyword: #569CD6", - "dark_plus_experimental": "keyword: #569CD6", + "dark_modern": "keyword: #569CD6", "hc_light": "keyword: #0F4A85", - "light_plus_experimental": "keyword: #0000FF" + "light_modern": "keyword: #0000FF" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -260,9 +260,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -274,9 +274,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json b/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json index fb0f1a0ffc8..7cc786089fd 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json @@ -8,9 +8,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -22,9 +22,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -134,9 +134,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -204,9 +204,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.class: #4EC9B0", - "dark_plus_experimental": "support.class: #4EC9B0", + "dark_modern": "support.class: #4EC9B0", "hc_light": "support.class: #185E73", - "light_plus_experimental": "support.class: #267F99" + "light_modern": "support.class: #267F99" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json index 1252ab32f8d..68504d08d8e 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -64,9 +64,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -176,9 +176,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -330,9 +330,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -344,9 +344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -442,9 +442,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -554,9 +554,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -666,9 +666,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -750,9 +750,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -834,9 +834,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -2780,9 +2780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2794,9 +2794,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2808,9 +2808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2822,9 +2822,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2836,9 +2836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2850,9 +2850,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2864,9 +2864,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2878,9 +2878,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -2892,9 +2892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2906,9 +2906,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2920,9 +2920,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -2934,9 +2934,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2948,9 +2948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2962,9 +2962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2976,9 +2976,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2990,9 +2990,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3004,9 +3004,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3018,9 +3018,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3032,9 +3032,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3046,9 +3046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3060,9 +3060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3074,9 +3074,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -3088,9 +3088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3102,9 +3102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3116,9 +3116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3130,9 +3130,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3144,9 +3144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3158,9 +3158,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3172,9 +3172,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3186,9 +3186,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -3200,9 +3200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3214,9 +3214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3228,9 +3228,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -3242,9 +3242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3256,9 +3256,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3270,9 +3270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3284,9 +3284,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3298,9 +3298,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3312,9 +3312,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3326,9 +3326,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3340,9 +3340,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3354,9 +3354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3368,9 +3368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3382,9 +3382,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -3396,9 +3396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3410,9 +3410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3424,9 +3424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3438,9 +3438,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3452,9 +3452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3466,9 +3466,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3480,9 +3480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3494,9 +3494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3508,9 +3508,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -3522,9 +3522,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3536,9 +3536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3550,9 +3550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3564,9 +3564,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3578,9 +3578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3592,9 +3592,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -3606,9 +3606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3620,9 +3620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3634,9 +3634,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -3648,9 +3648,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3662,9 +3662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -3676,9 +3676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3690,9 +3690,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -3704,9 +3704,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3718,9 +3718,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -3732,9 +3732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3746,9 +3746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3760,9 +3760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3774,9 +3774,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3788,9 +3788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3802,9 +3802,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -3816,9 +3816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3830,9 +3830,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3844,9 +3844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3858,9 +3858,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3872,9 +3872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3886,9 +3886,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3900,9 +3900,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3914,9 +3914,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -3928,9 +3928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3942,9 +3942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -3956,9 +3956,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3970,9 +3970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3984,9 +3984,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -3998,9 +3998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4012,9 +4012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4026,9 +4026,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4040,9 +4040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4054,9 +4054,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -4068,9 +4068,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4082,9 +4082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -4096,9 +4096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4110,9 +4110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4124,9 +4124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4138,9 +4138,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4152,9 +4152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4166,9 +4166,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4180,9 +4180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4194,9 +4194,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -4208,9 +4208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4222,9 +4222,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4236,9 +4236,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -4250,9 +4250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4264,9 +4264,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4278,9 +4278,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4292,9 +4292,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4306,9 +4306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4320,9 +4320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4334,9 +4334,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4348,9 +4348,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4362,9 +4362,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4376,9 +4376,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4390,9 +4390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4404,9 +4404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -4418,9 +4418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4432,9 +4432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4446,9 +4446,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4460,9 +4460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4474,9 +4474,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -4488,9 +4488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4502,9 +4502,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4516,9 +4516,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4530,9 +4530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4544,9 +4544,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -4558,9 +4558,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4572,9 +4572,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4586,9 +4586,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4600,9 +4600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4614,9 +4614,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4628,9 +4628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4642,9 +4642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4656,9 +4656,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4670,9 +4670,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4684,9 +4684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4698,9 +4698,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -4712,9 +4712,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4726,9 +4726,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -4740,9 +4740,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4754,9 +4754,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4768,9 +4768,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4782,9 +4782,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4796,9 +4796,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4810,9 +4810,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -4824,9 +4824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4838,9 +4838,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4852,9 +4852,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4866,9 +4866,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -4880,9 +4880,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4894,9 +4894,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -4908,9 +4908,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4922,9 +4922,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -4936,9 +4936,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4950,9 +4950,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -4964,9 +4964,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -4978,9 +4978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -4992,9 +4992,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5006,9 +5006,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5020,9 +5020,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5034,9 +5034,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5048,9 +5048,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5062,9 +5062,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5076,9 +5076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -5090,9 +5090,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5104,9 +5104,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5118,9 +5118,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5132,9 +5132,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5146,9 +5146,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5160,9 +5160,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5174,9 +5174,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5188,9 +5188,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5202,9 +5202,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -5216,9 +5216,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5230,9 +5230,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -5244,9 +5244,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5258,9 +5258,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5272,9 +5272,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5286,9 +5286,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5300,9 +5300,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5314,9 +5314,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5328,9 +5328,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5342,9 +5342,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5356,9 +5356,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5370,9 +5370,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5384,9 +5384,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5398,9 +5398,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5412,9 +5412,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5426,9 +5426,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -5440,9 +5440,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5454,9 +5454,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -5468,9 +5468,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5482,9 +5482,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5496,9 +5496,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5510,9 +5510,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5524,9 +5524,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5538,9 +5538,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -5552,9 +5552,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5566,9 +5566,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -5580,9 +5580,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5594,9 +5594,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -5608,9 +5608,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5622,9 +5622,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -5636,9 +5636,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5650,9 +5650,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5664,9 +5664,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5678,9 +5678,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5692,9 +5692,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5706,9 +5706,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5720,9 +5720,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5734,9 +5734,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -5748,9 +5748,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5762,9 +5762,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5776,9 +5776,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5790,9 +5790,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5804,9 +5804,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5818,9 +5818,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -5832,9 +5832,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5846,9 +5846,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5860,9 +5860,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -5874,9 +5874,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5888,9 +5888,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -5902,9 +5902,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5916,9 +5916,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5930,9 +5930,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5944,9 +5944,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5958,9 +5958,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -5972,9 +5972,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -5986,9 +5986,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6000,9 +6000,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6014,9 +6014,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6028,9 +6028,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6042,9 +6042,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6056,9 +6056,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6070,9 +6070,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -6084,9 +6084,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6098,9 +6098,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -6112,9 +6112,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6126,9 +6126,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6140,9 +6140,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6154,9 +6154,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6168,9 +6168,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6182,9 +6182,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -6196,9 +6196,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6210,9 +6210,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6224,9 +6224,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6238,9 +6238,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6252,9 +6252,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6266,9 +6266,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6280,9 +6280,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6294,9 +6294,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6308,9 +6308,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6322,9 +6322,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6336,9 +6336,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -6350,9 +6350,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6364,9 +6364,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -6378,9 +6378,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6392,9 +6392,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6406,9 +6406,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6420,9 +6420,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6434,9 +6434,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6448,9 +6448,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -6462,9 +6462,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6476,9 +6476,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6490,9 +6490,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6504,9 +6504,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6518,9 +6518,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6532,9 +6532,9 @@ "dark_vs": "keyword.operator.new: #569CD6", "light_vs": "keyword.operator.new: #0000FF", "hc_black": "keyword.operator.new: #569CD6", - "dark_plus_experimental": "keyword.operator.new: #569CD6", + "dark_modern": "keyword.operator.new: #569CD6", "hc_light": "keyword.operator.new: #0F4A85", - "light_plus_experimental": "keyword.operator.new: #0000FF" + "light_modern": "keyword.operator.new: #0000FF" } }, { @@ -6546,9 +6546,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6560,9 +6560,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -6574,9 +6574,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6588,9 +6588,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6602,9 +6602,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6616,9 +6616,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6630,9 +6630,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6644,9 +6644,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6658,9 +6658,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6672,9 +6672,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6686,9 +6686,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6700,9 +6700,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6714,9 +6714,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6728,9 +6728,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6742,9 +6742,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6756,9 +6756,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6770,9 +6770,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6784,9 +6784,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6798,9 +6798,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6812,9 +6812,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -6826,9 +6826,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6840,9 +6840,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6854,9 +6854,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6868,9 +6868,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6882,9 +6882,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6896,9 +6896,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -6910,9 +6910,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6924,9 +6924,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6938,9 +6938,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6952,9 +6952,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -6966,9 +6966,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -6980,9 +6980,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -6994,9 +6994,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7008,9 +7008,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7022,9 +7022,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7036,9 +7036,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7050,9 +7050,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -7064,9 +7064,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7078,9 +7078,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -7092,9 +7092,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7106,9 +7106,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7120,9 +7120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7134,9 +7134,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -7148,9 +7148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7162,9 +7162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7176,9 +7176,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7190,9 +7190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7204,9 +7204,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7218,9 +7218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7232,9 +7232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -7246,9 +7246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7260,9 +7260,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7274,9 +7274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7288,9 +7288,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7302,9 +7302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7316,9 +7316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7330,9 +7330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -7344,9 +7344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7358,9 +7358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -7372,9 +7372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7386,9 +7386,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7400,9 +7400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7414,9 +7414,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -7428,9 +7428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7442,9 +7442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7456,9 +7456,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7470,9 +7470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7484,9 +7484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -7498,9 +7498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7512,9 +7512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7526,9 +7526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7540,9 +7540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7554,9 +7554,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -7568,9 +7568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7582,9 +7582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -7596,9 +7596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7610,9 +7610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -7624,9 +7624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7638,9 +7638,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7652,9 +7652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7666,9 +7666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -7680,9 +7680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7694,9 +7694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7708,9 +7708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7722,9 +7722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7736,9 +7736,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -7750,9 +7750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7764,9 +7764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -7778,9 +7778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7792,9 +7792,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7806,9 +7806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7820,9 +7820,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -7834,9 +7834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7848,9 +7848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7862,9 +7862,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -7876,9 +7876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7890,9 +7890,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -7904,9 +7904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7918,9 +7918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -7932,9 +7932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7946,9 +7946,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7960,9 +7960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -7974,9 +7974,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -7988,9 +7988,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8002,9 +8002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8016,9 +8016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8030,9 +8030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8044,9 +8044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8058,9 +8058,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8072,9 +8072,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8086,9 +8086,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8100,9 +8100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8114,9 +8114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8128,9 +8128,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8142,9 +8142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8156,9 +8156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8170,9 +8170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8184,9 +8184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8198,9 +8198,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8212,9 +8212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8226,9 +8226,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -8240,9 +8240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8254,9 +8254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8268,9 +8268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8282,9 +8282,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8296,9 +8296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8310,9 +8310,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8324,9 +8324,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8338,9 +8338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8352,9 +8352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8366,9 +8366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8380,9 +8380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8394,9 +8394,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8408,9 +8408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8422,9 +8422,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8436,9 +8436,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8450,9 +8450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8464,9 +8464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8478,9 +8478,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8492,9 +8492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8506,9 +8506,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8520,9 +8520,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8534,9 +8534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8548,9 +8548,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8562,9 +8562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8576,9 +8576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8590,9 +8590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8604,9 +8604,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8618,9 +8618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8632,9 +8632,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8646,9 +8646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8660,9 +8660,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8674,9 +8674,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8688,9 +8688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8702,9 +8702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8716,9 +8716,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8730,9 +8730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8744,9 +8744,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -8758,9 +8758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8772,9 +8772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8786,9 +8786,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8800,9 +8800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8814,9 +8814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8828,9 +8828,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -8842,9 +8842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8856,9 +8856,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -8870,9 +8870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8884,9 +8884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -8898,9 +8898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8912,9 +8912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8926,9 +8926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8940,9 +8940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -8954,9 +8954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8968,9 +8968,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -8982,9 +8982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -8996,9 +8996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9010,9 +9010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9024,9 +9024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9038,9 +9038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9052,9 +9052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9066,9 +9066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9080,9 +9080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9094,9 +9094,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9108,9 +9108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9122,9 +9122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9136,9 +9136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9150,9 +9150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9164,9 +9164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9178,9 +9178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9192,9 +9192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9206,9 +9206,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9220,9 +9220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9234,9 +9234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9248,9 +9248,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9262,9 +9262,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9276,9 +9276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9290,9 +9290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9304,9 +9304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9318,9 +9318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9332,9 +9332,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -9346,9 +9346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9360,9 +9360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9374,9 +9374,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9388,9 +9388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9402,9 +9402,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9416,9 +9416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9430,9 +9430,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -9444,9 +9444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9458,9 +9458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -9472,9 +9472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9486,9 +9486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9500,9 +9500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9514,9 +9514,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9528,9 +9528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9542,9 +9542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -9556,9 +9556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9570,9 +9570,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9584,9 +9584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9598,9 +9598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9612,9 +9612,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9626,9 +9626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9640,9 +9640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -9654,9 +9654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9668,9 +9668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9682,9 +9682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9696,9 +9696,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9710,9 +9710,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -9724,9 +9724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9738,9 +9738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9752,9 +9752,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9766,9 +9766,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9780,9 +9780,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9794,9 +9794,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9808,9 +9808,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9822,9 +9822,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9836,9 +9836,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9850,9 +9850,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9864,9 +9864,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9878,9 +9878,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9892,9 +9892,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9906,9 +9906,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -9920,9 +9920,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9934,9 +9934,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -9948,9 +9948,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9962,9 +9962,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -9976,9 +9976,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -9990,9 +9990,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10004,9 +10004,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10018,9 +10018,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -10032,9 +10032,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10046,9 +10046,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10060,9 +10060,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10074,9 +10074,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10088,9 +10088,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10102,9 +10102,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10116,9 +10116,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10130,9 +10130,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10144,9 +10144,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10158,9 +10158,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -10172,9 +10172,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10186,9 +10186,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10200,9 +10200,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10214,9 +10214,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10228,9 +10228,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10242,9 +10242,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10256,9 +10256,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -10270,9 +10270,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10284,9 +10284,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10298,9 +10298,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10312,9 +10312,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10326,9 +10326,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -10340,9 +10340,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10354,9 +10354,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10368,9 +10368,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10382,9 +10382,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10396,9 +10396,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10410,9 +10410,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10424,9 +10424,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10438,9 +10438,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10452,9 +10452,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10466,9 +10466,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10480,9 +10480,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10494,9 +10494,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10508,9 +10508,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10522,9 +10522,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -10536,9 +10536,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10550,9 +10550,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -10564,9 +10564,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10578,9 +10578,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10592,9 +10592,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10606,9 +10606,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10620,9 +10620,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10634,9 +10634,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10648,9 +10648,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -10662,9 +10662,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10676,9 +10676,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10690,9 +10690,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10704,9 +10704,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10718,9 +10718,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10732,9 +10732,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10746,9 +10746,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10760,9 +10760,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10774,9 +10774,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -10788,9 +10788,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10802,9 +10802,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -10816,9 +10816,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10830,9 +10830,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10844,9 +10844,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10858,9 +10858,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10872,9 +10872,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10886,9 +10886,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -10900,9 +10900,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10914,9 +10914,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10928,9 +10928,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -10942,9 +10942,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10956,9 +10956,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -10970,9 +10970,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -10984,9 +10984,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -10998,9 +10998,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11012,9 +11012,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11026,9 +11026,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11040,9 +11040,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11054,9 +11054,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11068,9 +11068,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11082,9 +11082,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11096,9 +11096,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11110,9 +11110,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11124,9 +11124,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11138,9 +11138,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -11152,9 +11152,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11166,9 +11166,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11180,9 +11180,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11194,9 +11194,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11208,9 +11208,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11222,9 +11222,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11236,9 +11236,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11250,9 +11250,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11264,9 +11264,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -11278,9 +11278,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11292,9 +11292,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -11306,9 +11306,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11320,9 +11320,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11334,9 +11334,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11348,9 +11348,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11362,9 +11362,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11376,9 +11376,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -11390,9 +11390,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11404,9 +11404,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11418,9 +11418,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11432,9 +11432,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11446,9 +11446,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11460,9 +11460,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11474,9 +11474,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -11488,9 +11488,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11502,9 +11502,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11516,9 +11516,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11530,9 +11530,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11544,9 +11544,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11558,9 +11558,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -11572,9 +11572,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11586,9 +11586,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11600,9 +11600,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11614,9 +11614,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11628,9 +11628,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11642,9 +11642,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11656,9 +11656,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -11670,9 +11670,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11684,9 +11684,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -11698,9 +11698,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11712,9 +11712,9 @@ "dark_vs": "keyword.operator.new: #569CD6", "light_vs": "keyword.operator.new: #0000FF", "hc_black": "keyword.operator.new: #569CD6", - "dark_plus_experimental": "keyword.operator.new: #569CD6", + "dark_modern": "keyword.operator.new: #569CD6", "hc_light": "keyword.operator.new: #0F4A85", - "light_plus_experimental": "keyword.operator.new: #0000FF" + "light_modern": "keyword.operator.new: #0000FF" } }, { @@ -11726,9 +11726,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11740,9 +11740,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -11754,9 +11754,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11768,9 +11768,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11782,9 +11782,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11796,9 +11796,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11810,9 +11810,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11824,9 +11824,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11838,9 +11838,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11852,9 +11852,9 @@ "dark_vs": "constant.language: #569CD6", "light_vs": "constant.language: #0000FF", "hc_black": "constant.language: #569CD6", - "dark_plus_experimental": "constant.language: #569CD6", + "dark_modern": "constant.language: #569CD6", "hc_light": "constant.language: #0F4A85", - "light_plus_experimental": "constant.language: #0000FF" + "light_modern": "constant.language: #0000FF" } }, { @@ -11866,9 +11866,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11880,9 +11880,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11894,9 +11894,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11908,9 +11908,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11922,9 +11922,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11936,9 +11936,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11950,9 +11950,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -11964,9 +11964,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -11978,9 +11978,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -11992,9 +11992,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12006,9 +12006,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12020,9 +12020,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12034,9 +12034,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12048,9 +12048,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12062,9 +12062,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12076,9 +12076,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12090,9 +12090,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -12104,9 +12104,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12118,9 +12118,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12132,9 +12132,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12146,9 +12146,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12160,9 +12160,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12174,9 +12174,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12188,9 +12188,9 @@ "dark_vs": "storage.modifier: #569CD6", "light_vs": "storage.modifier: #0000FF", "hc_black": "storage.modifier: #569CD6", - "dark_plus_experimental": "storage.modifier: #569CD6", + "dark_modern": "storage.modifier: #569CD6", "hc_light": "storage.modifier: #0F4A85", - "light_plus_experimental": "storage.modifier: #0000FF" + "light_modern": "storage.modifier: #0000FF" } }, { @@ -12202,9 +12202,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12216,9 +12216,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -12230,9 +12230,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12244,9 +12244,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12258,9 +12258,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12272,9 +12272,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12286,9 +12286,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12300,9 +12300,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -12314,9 +12314,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12328,9 +12328,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12342,9 +12342,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12356,9 +12356,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12370,9 +12370,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -12384,9 +12384,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12398,9 +12398,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -12412,9 +12412,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12426,9 +12426,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12440,9 +12440,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12454,9 +12454,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12468,9 +12468,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12482,9 +12482,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -12496,9 +12496,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12510,9 +12510,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12524,9 +12524,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -12538,9 +12538,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12552,9 +12552,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12566,9 +12566,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12580,9 +12580,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12594,9 +12594,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12608,9 +12608,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -12622,9 +12622,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12636,9 +12636,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12650,9 +12650,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12664,9 +12664,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -12678,9 +12678,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12692,9 +12692,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12706,9 +12706,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12720,9 +12720,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12734,9 +12734,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -12748,9 +12748,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12762,9 +12762,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12776,9 +12776,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12790,9 +12790,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12804,9 +12804,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12818,9 +12818,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -12832,9 +12832,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12846,9 +12846,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -12860,9 +12860,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12874,9 +12874,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12888,9 +12888,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12902,9 +12902,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12916,9 +12916,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -12930,9 +12930,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12944,9 +12944,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -12958,9 +12958,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -12972,9 +12972,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -12986,9 +12986,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13000,9 +13000,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13014,9 +13014,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13028,9 +13028,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13042,9 +13042,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13056,9 +13056,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13070,9 +13070,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13084,9 +13084,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -13098,9 +13098,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13112,9 +13112,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13126,9 +13126,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13140,9 +13140,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13154,9 +13154,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13168,9 +13168,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13182,9 +13182,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13196,9 +13196,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13210,9 +13210,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -13224,9 +13224,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13238,9 +13238,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13252,9 +13252,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13266,9 +13266,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13280,9 +13280,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -13294,9 +13294,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13308,9 +13308,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13322,9 +13322,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13336,9 +13336,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13350,9 +13350,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -13364,9 +13364,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13378,9 +13378,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13392,9 +13392,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13406,9 +13406,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13420,9 +13420,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13434,9 +13434,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -13448,9 +13448,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13462,9 +13462,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13476,9 +13476,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13490,9 +13490,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13504,9 +13504,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13518,9 +13518,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13532,9 +13532,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13546,9 +13546,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13560,9 +13560,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13574,9 +13574,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13588,9 +13588,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13602,9 +13602,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13616,9 +13616,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13630,9 +13630,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -13644,9 +13644,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13658,9 +13658,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13672,9 +13672,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13686,9 +13686,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13700,9 +13700,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13714,9 +13714,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -13728,9 +13728,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13742,9 +13742,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13756,9 +13756,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13770,9 +13770,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13784,9 +13784,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -13798,9 +13798,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13812,9 +13812,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13826,9 +13826,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13840,9 +13840,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -13854,9 +13854,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13868,9 +13868,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13882,9 +13882,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13896,9 +13896,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13910,9 +13910,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13924,9 +13924,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -13938,9 +13938,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13952,9 +13952,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -13966,9 +13966,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -13980,9 +13980,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -13994,9 +13994,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14008,9 +14008,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14022,9 +14022,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14036,9 +14036,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14050,9 +14050,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14064,9 +14064,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -14078,9 +14078,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -14092,9 +14092,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14106,9 +14106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14120,9 +14120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14134,9 +14134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14148,9 +14148,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -14162,9 +14162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14176,9 +14176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14190,9 +14190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14204,9 +14204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14218,9 +14218,9 @@ "dark_vs": "variable.language: #569CD6", "light_vs": "variable.language: #0000FF", "hc_black": "variable.language.this: #569CD6", - "dark_plus_experimental": "variable.language: #569CD6", + "dark_modern": "variable.language: #569CD6", "hc_light": "variable.language: #0F4A85", - "light_plus_experimental": "variable.language: #0000FF" + "light_modern": "variable.language: #0000FF" } }, { @@ -14232,9 +14232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14246,9 +14246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14260,9 +14260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14274,9 +14274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14288,9 +14288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14302,9 +14302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14316,9 +14316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14330,9 +14330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14344,9 +14344,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14358,9 +14358,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -14372,9 +14372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14386,9 +14386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14400,9 +14400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14414,9 +14414,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -14428,9 +14428,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14442,9 +14442,9 @@ "dark_vs": "keyword.operator.new: #569CD6", "light_vs": "keyword.operator.new: #0000FF", "hc_black": "keyword.operator.new: #569CD6", - "dark_plus_experimental": "keyword.operator.new: #569CD6", + "dark_modern": "keyword.operator.new: #569CD6", "hc_light": "keyword.operator.new: #0F4A85", - "light_plus_experimental": "keyword.operator.new: #0000FF" + "light_modern": "keyword.operator.new: #0000FF" } }, { @@ -14456,9 +14456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14470,9 +14470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -14484,9 +14484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14498,9 +14498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -14512,9 +14512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -14526,9 +14526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json b/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json index ea817681ce9..2d8b7a5fbf2 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -386,9 +386,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -470,9 +470,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -484,9 +484,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -526,9 +526,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -568,9 +568,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -610,9 +610,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } }, { @@ -694,9 +694,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -736,9 +736,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -750,9 +750,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.type: #4EC9B0", - "dark_plus_experimental": "support.type: #4EC9B0", + "dark_modern": "support.type: #4EC9B0", "hc_light": "support.type: #185E73", - "light_plus_experimental": "support.type: #267F99" + "light_modern": "support.type: #267F99" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -806,9 +806,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -820,9 +820,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -988,9 +988,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "support.function: #DCDCAA", - "dark_plus_experimental": "support.function: #DCDCAA", + "dark_modern": "support.function: #DCDCAA", "hc_light": "support.function: #5E2CBC", - "light_plus_experimental": "support.function: #795E26" + "light_modern": "support.function: #795E26" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.function: #DCDCAA", - "dark_plus_experimental": "entity.name.function: #DCDCAA", + "dark_modern": "entity.name.function: #DCDCAA", "hc_light": "entity.name.function: #5E2CBC", - "light_plus_experimental": "entity.name.function: #795E26" + "light_modern": "entity.name.function: #795E26" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2304,9 +2304,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2318,9 +2318,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2332,9 +2332,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2346,9 +2346,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2360,9 +2360,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2374,9 +2374,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2388,9 +2388,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2402,9 +2402,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2416,9 +2416,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2430,9 +2430,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2444,9 +2444,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2458,9 +2458,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2472,9 +2472,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2486,9 +2486,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2500,9 +2500,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2514,9 +2514,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2528,9 +2528,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2542,9 +2542,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2556,9 +2556,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2570,9 +2570,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2584,9 +2584,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2598,9 +2598,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2612,9 +2612,9 @@ "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4", - "dark_plus_experimental": "keyword.operator: #D4D4D4", + "dark_modern": "keyword.operator: #D4D4D4", "hc_light": "keyword.operator: #000000", - "light_plus_experimental": "keyword.operator: #000000" + "light_modern": "keyword.operator: #000000" } }, { @@ -2626,9 +2626,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -2640,9 +2640,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2654,9 +2654,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2668,9 +2668,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2682,9 +2682,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2696,9 +2696,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2710,9 +2710,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2724,9 +2724,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2738,9 +2738,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2752,9 +2752,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -2766,9 +2766,9 @@ "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "dark_plus_experimental": "storage.type: #569CD6", + "dark_modern": "storage.type: #569CD6", "hc_light": "storage.type: #0F4A85", - "light_plus_experimental": "storage.type: #0000FF" + "light_modern": "storage.type: #0000FF" } } ] \ No newline at end of file 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 abd60714514..117ad95d8b2 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json @@ -8,9 +8,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -78,9 +78,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -148,9 +148,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -162,9 +162,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -176,9 +176,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -288,9 +288,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -302,9 +302,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -316,9 +316,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -428,9 +428,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -442,9 +442,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -498,9 +498,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -512,9 +512,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -526,9 +526,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -540,9 +540,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -596,9 +596,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -610,9 +610,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -624,9 +624,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -638,9 +638,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -652,9 +652,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -666,9 +666,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -708,9 +708,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -722,9 +722,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -792,9 +792,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -806,9 +806,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -820,9 +820,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -862,9 +862,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -918,9 +918,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -932,9 +932,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -946,9 +946,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -960,9 +960,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -974,9 +974,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -988,9 +988,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1450,9 +1450,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1464,9 +1464,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1478,9 +1478,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1492,9 +1492,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1506,9 +1506,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1520,9 +1520,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1534,9 +1534,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1548,9 +1548,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1562,9 +1562,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1576,9 +1576,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1590,9 +1590,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1604,9 +1604,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1618,9 +1618,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1632,9 +1632,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1646,9 +1646,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1660,9 +1660,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1674,9 +1674,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1688,9 +1688,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1702,9 +1702,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1716,9 +1716,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1730,9 +1730,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1744,9 +1744,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1758,9 +1758,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1772,9 +1772,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1786,9 +1786,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1800,9 +1800,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1814,9 +1814,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1828,9 +1828,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1842,9 +1842,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -1856,9 +1856,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -1870,9 +1870,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -1884,9 +1884,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1898,9 +1898,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -1912,9 +1912,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1926,9 +1926,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -1940,9 +1940,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -1954,9 +1954,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -1968,9 +1968,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -1982,9 +1982,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1996,9 +1996,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2010,9 +2010,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2024,9 +2024,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2038,9 +2038,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2052,9 +2052,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2066,9 +2066,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -2080,9 +2080,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -2094,9 +2094,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -2108,9 +2108,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2122,9 +2122,9 @@ "dark_vs": "entity.other.attribute-name: #9CDCFE", "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", - "dark_plus_experimental": "entity.other.attribute-name: #9CDCFE", + "dark_modern": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78", - "light_plus_experimental": "entity.other.attribute-name: #E50000" + "light_modern": "entity.other.attribute-name: #E50000" } }, { @@ -2136,9 +2136,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2150,9 +2150,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -2164,9 +2164,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -2178,9 +2178,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.quoted.double.xml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.quoted.double.xml: #0F4A85", - "light_plus_experimental": "string.quoted.double.xml: #0000FF" + "light_modern": "string.quoted.double.xml: #0000FF" } }, { @@ -2192,9 +2192,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2206,9 +2206,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -2220,9 +2220,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2234,9 +2234,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2248,9 +2248,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2262,9 +2262,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } }, { @@ -2276,9 +2276,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -2290,9 +2290,9 @@ "dark_vs": "punctuation.definition.tag: #808080", "light_vs": "punctuation.definition.tag: #800000", "hc_black": "punctuation.definition.tag: #808080", - "dark_plus_experimental": "punctuation.definition.tag: #808080", + "dark_modern": "punctuation.definition.tag: #808080", "hc_light": "punctuation.definition.tag: #0F4A85", - "light_plus_experimental": "punctuation.definition.tag: #800000" + "light_modern": "punctuation.definition.tag: #800000" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json index 473f08ce007..407cc7c7a1a 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json @@ -8,9 +8,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -22,9 +22,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -36,9 +36,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -50,9 +50,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -64,9 +64,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -78,9 +78,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -134,9 +134,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "entity.name.type: #4EC9B0", - "dark_plus_experimental": "entity.name.type: #4EC9B0", + "dark_modern": "entity.name.type: #4EC9B0", "hc_light": "entity.name.type: #185E73", - "light_plus_experimental": "entity.name.type: #267F99" + "light_modern": "entity.name.type: #267F99" } }, { @@ -148,9 +148,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -162,9 +162,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -176,9 +176,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -218,9 +218,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -232,9 +232,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -246,9 +246,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -288,9 +288,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -302,9 +302,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -316,9 +316,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -330,9 +330,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -344,9 +344,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -358,9 +358,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -372,9 +372,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -386,9 +386,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -400,9 +400,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -414,9 +414,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -428,9 +428,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -442,9 +442,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -456,9 +456,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -470,9 +470,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -484,9 +484,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -498,9 +498,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -512,9 +512,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -526,9 +526,9 @@ "dark_vs": "comment: #6A9955", "light_vs": "comment: #008000", "hc_black": "comment: #7CA668", - "dark_plus_experimental": "comment: #6A9955", + "dark_modern": "comment: #6A9955", "hc_light": "comment: #515151", - "light_plus_experimental": "comment: #008000" + "light_modern": "comment: #008000" } }, { @@ -540,9 +540,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -554,9 +554,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -568,9 +568,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -582,9 +582,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -596,9 +596,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -610,9 +610,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -624,9 +624,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -638,9 +638,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -652,9 +652,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -666,9 +666,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -680,9 +680,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -694,9 +694,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -708,9 +708,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -722,9 +722,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -736,9 +736,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -750,9 +750,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -764,9 +764,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -778,9 +778,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -792,9 +792,9 @@ "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0", - "dark_plus_experimental": "keyword.control: #C586C0", + "dark_modern": "keyword.control: #C586C0", "hc_light": "keyword.control: #B5200D", - "light_plus_experimental": "keyword.control: #AF00DB" + "light_modern": "keyword.control: #AF00DB" } }, { @@ -806,9 +806,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "variable: #9CDCFE", - "dark_plus_experimental": "variable: #9CDCFE", + "dark_modern": "variable: #9CDCFE", "hc_light": "variable: #001080", - "light_plus_experimental": "variable: #001080" + "light_modern": "variable: #001080" } }, { @@ -820,9 +820,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -834,9 +834,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -848,9 +848,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -862,9 +862,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -876,9 +876,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -890,9 +890,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -904,9 +904,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.in.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.in.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.in.yaml: #0000FF" + "light_modern": "string.unquoted.plain.in.yaml: #0000FF" } }, { @@ -918,9 +918,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -932,9 +932,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -946,9 +946,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -960,9 +960,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -974,9 +974,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -988,9 +988,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1002,9 +1002,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1016,9 +1016,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1030,9 +1030,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1044,9 +1044,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1058,9 +1058,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1072,9 +1072,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1086,9 +1086,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -1100,9 +1100,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1114,9 +1114,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1128,9 +1128,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1142,9 +1142,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1156,9 +1156,9 @@ "dark_vs": "constant.numeric: #B5CEA8", "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8", - "dark_plus_experimental": "constant.numeric: #B5CEA8", + "dark_modern": "constant.numeric: #B5CEA8", "hc_light": "constant.numeric: #096D48", - "light_plus_experimental": "constant.numeric: #098658" + "light_modern": "constant.numeric: #098658" } }, { @@ -1170,9 +1170,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1184,9 +1184,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1198,9 +1198,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1212,9 +1212,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1226,9 +1226,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1240,9 +1240,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.in.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.in.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.in.yaml: #0000FF" + "light_modern": "string.unquoted.plain.in.yaml: #0000FF" } }, { @@ -1254,9 +1254,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1268,9 +1268,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1282,9 +1282,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.in.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.in.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.in.yaml: #0000FF" + "light_modern": "string.unquoted.plain.in.yaml: #0000FF" } }, { @@ -1296,9 +1296,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1310,9 +1310,9 @@ "dark_vs": "entity.name.tag: #569CD6", "light_vs": "entity.name.tag: #800000", "hc_black": "entity.name.tag: #569CD6", - "dark_plus_experimental": "entity.name.tag: #569CD6", + "dark_modern": "entity.name.tag: #569CD6", "hc_light": "entity.name.tag: #0F4A85", - "light_plus_experimental": "entity.name.tag: #800000" + "light_modern": "entity.name.tag: #800000" } }, { @@ -1324,9 +1324,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1338,9 +1338,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1352,9 +1352,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1366,9 +1366,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1380,9 +1380,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } }, { @@ -1394,9 +1394,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1408,9 +1408,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1422,9 +1422,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -1436,9 +1436,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string.unquoted.plain.out.yaml: #0000FF", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string.unquoted.plain.out.yaml: #0F4A85", - "light_plus_experimental": "string.unquoted.plain.out.yaml: #0000FF" + "light_modern": "string.unquoted.plain.out.yaml: #0000FF" } } ] \ No newline at end of file diff --git a/extensions/vscode-colorize-tests/test/colorize-results/tsconfig_off_json.json b/extensions/vscode-colorize-tests/test/colorize-results/tsconfig_off_json.json index d4f8bf6b243..a547a91a352 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/tsconfig_off_json.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/tsconfig_off_json.json @@ -8,9 +8,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -22,9 +22,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -36,9 +36,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -50,9 +50,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -64,9 +64,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -78,9 +78,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -92,9 +92,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -106,9 +106,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -120,9 +120,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -134,9 +134,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -148,9 +148,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -162,9 +162,9 @@ "dark_vs": "support.type.property-name: #9CDCFE", "light_vs": "support.type.property-name.json: #0451A5", "hc_black": "support.type.property-name: #D4D4D4", - "dark_plus_experimental": "support.type.property-name: #9CDCFE", + "dark_modern": "support.type.property-name: #9CDCFE", "hc_light": "support.type.property-name.json: #0451A5", - "light_plus_experimental": "support.type.property-name.json: #0451A5" + "light_modern": "support.type.property-name.json: #0451A5" } }, { @@ -176,9 +176,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -190,9 +190,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -204,9 +204,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -218,9 +218,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -232,9 +232,9 @@ "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "dark_plus_experimental": "string: #CE9178", + "dark_modern": "string: #CE9178", "hc_light": "string: #0F4A85", - "light_plus_experimental": "string: #A31515" + "light_modern": "string: #A31515" } }, { @@ -246,9 +246,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -260,9 +260,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } }, { @@ -274,9 +274,9 @@ "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF", - "dark_plus_experimental": "default: #CCCCCC", + "dark_modern": "default: #CCCCCC", "hc_light": "default: #292929", - "light_plus_experimental": "default: #3B3B3B" + "light_modern": "default: #3B3B3B" } } ] \ No newline at end of file diff --git a/src/vs/workbench/services/encryption/common/encryptionService.ts b/extensions/vscode-test-resolver/extension-browser.webpack.config.js similarity index 51% rename from src/vs/workbench/services/encryption/common/encryptionService.ts rename to extensions/vscode-test-resolver/extension-browser.webpack.config.js index d264a3b9dc0..ff7972a1aee 100644 --- a/src/vs/workbench/services/encryption/common/encryptionService.ts +++ b/extensions/vscode-test-resolver/extension-browser.webpack.config.js @@ -3,9 +3,18 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { ICommonEncryptionService } from 'vs/platform/encryption/common/encryptionService'; +//@ts-check -export const IEncryptionService = createDecorator('encryptionService'); +'use strict'; -export interface IEncryptionService extends ICommonEncryptionService { } +const withBrowserDefaults = require('../shared.webpack.config').browser; + +module.exports = withBrowserDefaults({ + context: __dirname, + entry: { + extension: './src/extension.browser.ts' + }, + output: { + filename: 'testResolverMain.js' + } +}); diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json index 921bbba555c..e721c65567a 100644 --- a/extensions/vscode-test-resolver/package.json +++ b/extensions/vscode-test-resolver/package.json @@ -4,10 +4,9 @@ "version": "0.0.1", "publisher": "vscode", "license": "MIT", - "enableProposedApi": true, "enabledApiProposals": [ "resolvers", - "tunnels" + "tunnels" ], "private": true, "engines": { @@ -32,6 +31,7 @@ "onCommand:vscode-testresolver.toggleConnectionPause" ], "main": "./out/extension", + "browser": "./dist/browser/testResolverMain", "devDependencies": { "@types/node": "16.x" }, @@ -95,6 +95,11 @@ "title": "Pause Connection (Test Reconnect)", "category": "Remote-TestResolver", "command": "vscode-testresolver.toggleConnectionPause" + }, + { + "title": "Slowdown Connection (Test Slow Down Indicator)", + "category": "Remote-TestResolver", + "command": "vscode-testresolver.toggleConnectionSlowdown" } ], "menus": { diff --git a/extensions/vscode-test-resolver/src/extension.browser.ts b/extensions/vscode-test-resolver/src/extension.browser.ts new file mode 100644 index 00000000000..93703fde4df --- /dev/null +++ b/extensions/vscode-test-resolver/src/extension.browser.ts @@ -0,0 +1,133 @@ +/*--------------------------------------------------------------------------------------------- + * 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 function activate(_context: vscode.ExtensionContext) { + vscode.workspace.registerRemoteAuthorityResolver('test', { + async resolve(_authority: string): Promise { + console.log(`Resolving ${_authority}`); + console.log(`Activating vscode.github-authentication to simulate auth`); + await vscode.extensions.getExtension('vscode.github-authentication')?.activate(); + return new vscode.ManagedResolvedAuthority(async () => { + return new InitialManagedMessagePassing(); + }); + } + }); +} + +/** + * The initial message passing is a bit special because we need to + * wait for the HTTP headers to arrive before we can create the + * actual WebSocket. + */ +class InitialManagedMessagePassing implements vscode.ManagedMessagePassing { + private readonly dataEmitter = new vscode.EventEmitter(); + private readonly closeEmitter = new vscode.EventEmitter(); + private readonly endEmitter = new vscode.EventEmitter(); + + public readonly onDidReceiveMessage = this.dataEmitter.event; + public readonly onDidClose = this.closeEmitter.event; + public readonly onDidEnd = this.endEmitter.event; + + private _actual: OpeningManagedMessagePassing | null = null; + private _isDisposed = false; + + public send(d: Uint8Array): void { + if (this._actual) { + // we already got the HTTP headers + this._actual.send(d); + return; + } + + if (this._isDisposed) { + // got disposed in the meantime, ignore + return; + } + + // we now received the HTTP headers + const decoder = new TextDecoder(); + const str = decoder.decode(d); + + // example str GET ws://localhost/oss-dev?reconnectionToken=4354a323-a45a-452c-b5d7-d8d586e1cd5c&reconnection=false&skipWebSocketFrames=true HTTP/1.1 + const match = str.match(/GET\s+(\S+)\s+HTTP/); + if (!match) { + console.error(`Coult not parse ${str}`); + this.closeEmitter.fire(new Error(`Coult not parse ${str}`)); + return; + } + + // example url ws://localhost/oss-dev?reconnectionToken=4354a323-a45a-452c-b5d7-d8d586e1cd5c&reconnection=false&skipWebSocketFrames=true + const url = new URL(match[1]); + + // extract path and query from url using browser's URL + const parsedUrl = new URL(url); + this._actual = new OpeningManagedMessagePassing(parsedUrl, this.dataEmitter, this.closeEmitter, this.endEmitter); + } + + public end(): void { + if (this._actual) { + this._actual.end(); + return; + } + this._isDisposed = true; + } +} + +class OpeningManagedMessagePassing { + + private readonly socket: WebSocket; + private isOpen = false; + private bufferedData: Uint8Array[] = []; + + constructor( + url: URL, + dataEmitter: vscode.EventEmitter, + closeEmitter: vscode.EventEmitter, + _endEmitter: vscode.EventEmitter + ) { + this.socket = new WebSocket(`ws://localhost:9888${url.pathname}${url.search.replace(/skipWebSocketFrames=true/, 'skipWebSocketFrames=false')}`); + this.socket.addEventListener('close', () => closeEmitter.fire(undefined)); + this.socket.addEventListener('error', (e) => closeEmitter.fire(new Error(String(e)))); + this.socket.addEventListener('message', async (e) => { + const arrayBuffer = await e.data.arrayBuffer(); + dataEmitter.fire(new Uint8Array(arrayBuffer)); + }); + this.socket.addEventListener('open', () => { + while (this.bufferedData.length > 0) { + const first = this.bufferedData.shift()!; + this.socket.send(first); + } + this.isOpen = true; + + // https://tools.ietf.org/html/rfc6455#section-4 + // const requestNonce = req.headers['sec-websocket-key']; + // const hash = crypto.createHash('sha1'); + // hash.update(requestNonce + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11'); + // const responseNonce = hash.digest('base64'); + const responseHeaders = [ + `HTTP/1.1 101 Switching Protocols`, + `Upgrade: websocket`, + `Connection: Upgrade`, + `Sec-WebSocket-Accept: TODO` + ]; + const textEncoder = new TextEncoder(); + textEncoder.encode(responseHeaders.join('\r\n') + '\r\n\r\n'); + dataEmitter.fire(textEncoder.encode(responseHeaders.join('\r\n') + '\r\n\r\n')); + }); + } + + public send(d: Uint8Array): void { + if (!this.isOpen) { + this.bufferedData.push(d); + return; + } + this.socket.send(d); + } + + public end(): void { + this.socket.close(); + } +} diff --git a/extensions/vscode-test-resolver/src/extension.ts b/extensions/vscode-test-resolver/src/extension.ts index 4178c2b823e..8e12e622e05 100644 --- a/extensions/vscode-test-resolver/src/extension.ts +++ b/extensions/vscode-test-resolver/src/extension.ts @@ -22,11 +22,25 @@ const enum CharCode { let outputChannel: vscode.OutputChannel; +const SLOWED_DOWN_CONNECTION_DELAY = 800; + export function activate(context: vscode.ExtensionContext) { let connectionPaused = false; const connectionPausedEvent = new vscode.EventEmitter(); + let connectionSlowedDown = false; + const connectionSlowedDownEvent = new vscode.EventEmitter(); + const slowedDownConnections = new Set(); + connectionSlowedDownEvent.event(slowed => { + if (!slowed) { + for (const cb of slowedDownConnections) { + cb(); + } + slowedDownConnections.clear(); + } + }); + function getTunnelFeatures(): vscode.TunnelInformation['tunnelFeatures'] { return { elevation: true, @@ -50,6 +64,22 @@ export function activate(context: vscode.ExtensionContext) { }; } + function maybeSlowdown(): Promise | void { + if (connectionSlowedDown) { + return new Promise(resolve => { + const handle = setTimeout(() => { + resolve(); + slowedDownConnections.delete(resolve); + }, SLOWED_DOWN_CONNECTION_DELAY); + + slowedDownConnections.add(() => { + resolve(); + clearTimeout(handle); + }); + }); + } + } + function doResolve(authority: string, progress: vscode.Progress<{ message?: string; increment?: number }>): Promise { if (connectionPaused) { throw vscode.RemoteAuthorityResolverError.TemporarilyNotAvailable('Not available right now'); @@ -237,13 +267,15 @@ export function activate(context: vscode.ExtensionContext) { connectionPausedEvent.event(_ => handleConnectionPause()); handleConnectionPause(); - proxySocket.on('data', (data) => { + proxySocket.on('data', async (data) => { + await maybeSlowdown(); remoteReady = remoteSocket.write(data); if (!remoteReady) { proxySocket.pause(); } }); - remoteSocket.on('data', (data) => { + remoteSocket.on('data', async (data) => { + await maybeSlowdown(); localReady = proxySocket.write(data); if (!localReady) { remoteSocket.pause(); @@ -358,6 +390,22 @@ export function activate(context: vscode.ExtensionContext) { connectionPausedEvent.fire(connectionPaused); })); + const slowdownStatusBarEntry = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left); + slowdownStatusBarEntry.text = 'Remote connection slowed down. Click to undo'; + slowdownStatusBarEntry.command = 'vscode-testresolver.toggleConnectionSlowdown'; + slowdownStatusBarEntry.backgroundColor = new vscode.ThemeColor('statusBarItem.errorBackground'); + + context.subscriptions.push(vscode.commands.registerCommand('vscode-testresolver.toggleConnectionSlowdown', () => { + if (!connectionSlowedDown) { + connectionSlowedDown = true; + slowdownStatusBarEntry.show(); + } else { + connectionSlowedDown = false; + slowdownStatusBarEntry.hide(); + } + connectionSlowedDownEvent.fire(connectionSlowedDown); + })); + context.subscriptions.push(vscode.commands.registerCommand('vscode-testresolver.openTunnel', async () => { const result = await vscode.window.showInputBox({ prompt: 'Enter the remote port for the tunnel', diff --git a/extensions/vscode-test-resolver/tsconfig.json b/extensions/vscode-test-resolver/tsconfig.json index 4a8025df9b5..d1c0f9d9f50 100644 --- a/extensions/vscode-test-resolver/tsconfig.json +++ b/extensions/vscode-test-resolver/tsconfig.json @@ -4,6 +4,9 @@ "outDir": "./out", "types": [ "node" + ], + "lib": [ + "WebWorker" ] }, "include": [ diff --git a/extensions/yarn.lock b/extensions/yarn.lock index 34530cbba39..5b00e9e5431 100644 --- a/extensions/yarn.lock +++ b/extensions/yarn.lock @@ -228,10 +228,10 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -typescript@^5.1.0-dev.20230515: - version "5.1.0-dev.20230515" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.0-dev.20230515.tgz#cf1c5b9542d7bb6f5eeb7878f041705ee6f963be" - integrity sha512-yn0MGsy6U0QAVF+lXW6LPupQmuRsyA0xUJetqw2tDqa+49231BpkhTuY6oEwLsc98tiEzCfIw7hzbLsiwVGFaA== +typescript@^5.2.0-dev.20230731: + version "5.2.0-dev.20230731" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.0-dev.20230731.tgz#a72083c07043568ab856dd8ca0d8f3a708c3e3a6" + integrity sha512-RJVLgnDgu67ZrohYy0aBea+5TICfRod36+24zw0bR/KJDQJO9mlIjTC0k+/PKw87fXP5JuUHqepEk15PvFya7A== vscode-grammar-updater@^1.1.0: version "1.1.0" diff --git a/package.json b/package.json index a8008f89e02..cb1ac52bf18 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", - "version": "1.79.0", - "distro": "4e88da3231fbd0b33666c0d1b550b1ecdb739449", + "version": "1.82.0", + "distro": "bc3b9188018c76ecdd69d813c95c5101e5f3da5e", "author": { "name": "Microsoft Corporation" }, @@ -45,8 +45,10 @@ "valid-layers-check": "node build/lib/layersChecker.js", "update-distro": "node build/npm/update-distro.mjs", "web": "echo 'yarn web' is replaced by './scripts/code-server' or './scripts/code-web'", + "compile-cli": "gulp compile-cli", "compile-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile-web", "watch-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-web", + "watch-cli": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-cli", "eslint": "node build/eslint", "stylelint": "node build/stylelint", "playwright-install": "node build/azure-pipelines/common/installPlaywright.js", @@ -57,7 +59,9 @@ "minify-vscode-reh-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh-web", "hygiene": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js hygiene", "core-ci": "node --max_old_space_size=8095 ./node_modules/gulp/bin/gulp.js core-ci", + "core-ci-pr": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js core-ci-pr", "extensions-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js extensions-ci", + "extensions-ci-pr": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js extensions-ci-pr", "perf": "node scripts/code-perf.js" }, "dependencies": { @@ -66,43 +70,46 @@ "@parcel/watcher": "2.1.0", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/policy-watcher": "^1.1.4", - "@vscode/proxy-agent": "^0.13.2", - "@vscode/ripgrep": "^1.15.3", + "@vscode/proxy-agent": "^0.17.2", + "@vscode/ripgrep": "^1.15.5", "@vscode/spdlog": "^0.13.10", - "@vscode/sqlite3": "5.1.4-vscode", + "@vscode/sqlite3": "5.1.6-vscode", "@vscode/sudo-prompt": "9.3.1", "@vscode/vscode-languagedetection": "1.0.21", - "graceful-fs": "4.2.8", + "@vscode/windows-mutex": "^0.4.4", + "@vscode/windows-process-tree": "^0.5.0", + "@vscode/windows-registry": "^1.1.0", + "graceful-fs": "4.2.11", "http-proxy-agent": "^2.1.0", "https-proxy-agent": "^2.2.3", "jschardet": "3.0.0", + "kerberos": "^2.0.1", "keytar": "7.9.0", "minimist": "^1.2.6", - "native-is-elevated": "0.6.0", + "native-is-elevated": "0.7.0", "native-keymap": "^3.3.2", "native-watchdog": "^1.4.1", - "node-pty": "0.11.0-beta32", + "node-pty": "1.1.0-beta1", "tas-client-umd": "0.1.8", "v8-inspect-profiler": "^0.1.0", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "9.0.0", - "xterm": "5.2.0-beta.41", - "xterm-addon-canvas": "0.4.0-beta.11", - "xterm-addon-image": "0.4.0", - "xterm-addon-search": "0.11.0", - "xterm-addon-serialize": "0.9.0", + "xterm": "5.3.0-beta.24", + "xterm-addon-canvas": "0.5.0-beta.7", + "xterm-addon-image": "0.5.0", + "xterm-addon-search": "0.13.0-beta.4", + "xterm-addon-serialize": "0.11.0-beta.6", "xterm-addon-unicode11": "0.5.0", - "xterm-addon-webgl": "0.15.0-beta.10", - "xterm-headless": "5.2.0-beta.41", + "xterm-addon-webgl": "0.16.0-beta.6", + "xterm-headless": "5.3.0-beta.24", "yauzl": "^2.9.2", "yazl": "^2.4.3" }, "devDependencies": { - "7zip": "0.0.6", - "@playwright/test": "1.32.3", - "@swc/cli": "0.1.57", - "@swc/core": "1.3.32", + "@playwright/test": "^1.34.3", + "@swc/cli": "0.1.62", + "@swc/core": "1.3.62", "@types/cookie": "^0.3.3", "@types/cssnano": "^4.0.0", "@types/debug": "4.1.5", @@ -110,6 +117,7 @@ "@types/gulp-postcss": "^8.0.0", "@types/gulp-svgmin": "^1.2.1", "@types/http-proxy-agent": "^2.0.1", + "@types/kerberos": "^1.1.2", "@types/keytar": "^4.4.0", "@types/minimist": "^1.2.1", "@types/mocha": "^9.1.1", @@ -127,7 +135,7 @@ "@typescript-eslint/eslint-plugin": "^5.57.0", "@typescript-eslint/experimental-utils": "^5.57.0", "@typescript-eslint/parser": "^5.57.0", - "@vscode/gulp-electron": "^1.34.0", + "@vscode/gulp-electron": "^1.36.0", "@vscode/l10n-dev": "0.0.21", "@vscode/telemetry-extractor": "^1.9.9", "@vscode/test-web": "^0.0.41", @@ -142,7 +150,7 @@ "cssnano": "^4.1.11", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "22.3.5", + "electron": "22.3.18", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^39.3.2", @@ -203,8 +211,8 @@ "style-loader": "^3.3.2", "ts-loader": "^9.4.2", "ts-node": "^10.9.1", - "tsec": "0.1.4", - "typescript": "^5.2.0-dev.20230516", + "tsec": "0.2.7", + "typescript": "^5.2.0-dev.20230731", "typescript-formatter": "7.1.0", "underscore": "^1.12.1", "util": "^0.12.4", @@ -223,9 +231,6 @@ "url": "https://github.com/microsoft/vscode/issues" }, "optionalDependencies": { - "@vscode/windows-mutex": "0.4.2", - "@vscode/windows-process-tree": "0.4.2", - "@vscode/windows-registry": "1.0.10", "windows-foreground-love": "0.5.0" } } diff --git a/product.json b/product.json index 56048315511..2ae3ee8f0f8 100644 --- a/product.json +++ b/product.json @@ -24,18 +24,20 @@ "win32arm64UserAppId": "{{3AEBF0C8-F733-4AD4-BADE-FDB816D53D7B}", "win32AppUserModelId": "Microsoft.CodeOSS", "win32ShellNameShort": "C&ode - OSS", - "win32TunnelServiceMutex": "vscodetunnelserviceoss", - "win32TunnelMutex": "vscodetunneloss", + "win32TunnelServiceMutex": "vscodeoss-tunnelservice", + "win32TunnelMutex": "vscodeoss-tunnel", "darwinBundleIdentifier": "com.visualstudio.code.oss", "linuxIconName": "code-oss", "licenseFileName": "LICENSE.txt", "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new", + "nodejsRepository": "https://nodejs.org", "urlProtocol": "code-oss", "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/", "builtInExtensions": [ { "name": "ms-vscode.js-debug-companion", - "version": "1.0.18", + "version": "1.1.2", + "sha256": "e034b8b41beb4e97e02c70f7175bd88abe66048374c2bd629f54bb33354bc2aa", "repo": "https://github.com/microsoft/vscode-js-debug-companion", "metadata": { "id": "99cb0b7f-7354-4278-b8da-6cc79972169d", @@ -50,7 +52,8 @@ }, { "name": "ms-vscode.js-debug", - "version": "1.78.0", + "version": "1.81.0", + "sha256": "6d1c7ee89881afd65e8fee47445b6a1c5fb345bf30e2bdf70cd2fdd8d1ff6dec", "repo": "https://github.com/microsoft/vscode-js-debug", "metadata": { "id": "25629058-ddac-4e17-abba-74678e126c5d", @@ -66,6 +69,7 @@ { "name": "ms-vscode.vscode-js-profile-table", "version": "1.0.3", + "sha256": "b9dab017506d9e6a469a0f82b392e4cb1d7a25a4843f1db8ba396cbee209cfc5", "repo": "https://github.com/microsoft/vscode-js-profile-visualizer", "metadata": { "id": "7e52b41b-71ad-457b-ab7e-0620f1fc4feb", diff --git a/remote/.yarnrc b/remote/.yarnrc index 340ea50f6b3..29d716339bf 100644 --- a/remote/.yarnrc +++ b/remote/.yarnrc @@ -1,4 +1,5 @@ disturl "http://nodejs.org/dist" target "16.17.1" +ms_build_id "220517" runtime "node" build_from_source "true" diff --git a/remote/package.json b/remote/package.json index b5f88719e85..cb2f00dcd8a 100644 --- a/remote/package.json +++ b/remote/package.json @@ -7,36 +7,35 @@ "@microsoft/1ds-post-js": "^3.2.2", "@parcel/watcher": "2.1.0", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/proxy-agent": "^0.13.2", - "@vscode/ripgrep": "^1.15.3", + "@vscode/proxy-agent": "^0.17.2", + "@vscode/ripgrep": "^1.15.5", "@vscode/spdlog": "^0.13.10", "@vscode/vscode-languagedetection": "1.0.21", + "@vscode/windows-process-tree": "^0.5.0", + "@vscode/windows-registry": "^1.1.0", "cookie": "^0.4.0", - "graceful-fs": "4.2.8", + "graceful-fs": "4.2.11", "http-proxy-agent": "^2.1.0", "https-proxy-agent": "^2.2.3", "jschardet": "3.0.0", + "kerberos": "^2.0.1", "keytar": "7.9.0", "minimist": "^1.2.6", "native-watchdog": "^1.4.1", - "node-pty": "0.11.0-beta32", + "node-pty": "1.1.0-beta1", "tas-client-umd": "0.1.8", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "9.0.0", - "xterm": "5.2.0-beta.41", - "xterm-addon-canvas": "0.4.0-beta.11", - "xterm-addon-image": "0.4.0", - "xterm-addon-search": "0.11.0", - "xterm-addon-serialize": "0.9.0", + "xterm": "5.3.0-beta.24", + "xterm-addon-canvas": "0.5.0-beta.7", + "xterm-addon-image": "0.5.0", + "xterm-addon-search": "0.13.0-beta.4", + "xterm-addon-serialize": "0.11.0-beta.6", "xterm-addon-unicode11": "0.5.0", - "xterm-addon-webgl": "0.15.0-beta.10", - "xterm-headless": "5.2.0-beta.41", + "xterm-addon-webgl": "0.16.0-beta.6", + "xterm-headless": "5.3.0-beta.24", "yauzl": "^2.9.2", "yazl": "^2.4.3" - }, - "optionalDependencies": { - "@vscode/windows-process-tree": "0.4.2", - "@vscode/windows-registry": "1.0.10" } } diff --git a/remote/web/package.json b/remote/web/package.json index 5a43f81b18c..a0ab2c68bd2 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -11,11 +11,11 @@ "tas-client-umd": "0.1.8", "vscode-oniguruma": "1.7.0", "vscode-textmate": "9.0.0", - "xterm": "5.2.0-beta.41", - "xterm-addon-canvas": "0.4.0-beta.11", - "xterm-addon-image": "0.4.0", - "xterm-addon-search": "0.11.0", + "xterm": "5.3.0-beta.24", + "xterm-addon-canvas": "0.5.0-beta.7", + "xterm-addon-image": "0.5.0", + "xterm-addon-search": "0.13.0-beta.4", "xterm-addon-unicode11": "0.5.0", - "xterm-addon-webgl": "0.15.0-beta.10" + "xterm-addon-webgl": "0.16.0-beta.6" } } diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index 48f9cb8b376..a6e62ad0a8f 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -68,32 +68,32 @@ vscode-textmate@9.0.0: resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c" integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg== -xterm-addon-canvas@0.4.0-beta.11: - version "0.4.0-beta.11" - resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.4.0-beta.11.tgz#d627050d7e2290ae804c0ec730d5bfc5861afd78" - integrity sha512-yfkx0R7wB3L+fWf1doDmEfwYIeNMVq4uXlq7sCvfPQAVA2H4eOH/s+SS1mhyy0A6DDEbM4eEQ7CroRZIsnVtMA== +xterm-addon-canvas@0.5.0-beta.7: + version "0.5.0-beta.7" + resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.5.0-beta.7.tgz#27a6753a0d8551248bffb15c29d5d88bf6b2a071" + integrity sha512-33a8kSR/uirSrtPkNiCO5MnRwuvR0hTvm1K+541XDsa9QS0VF0xPZoC4MEWHHXfSMzrTFgx1edpXqYOKc2yWtw== -xterm-addon-image@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.4.0.tgz#36e98fa892db11755a5f6e9654f924e876e29bf8" - integrity sha512-3wumCJo4WTzxvecSMxJ7XtpVQeFe4gE2cdHCyUdo7zagVkS18YXJacGx6DjlAIccdJn6/LhGuD99xOSSvYx9Gw== +xterm-addon-image@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.5.0.tgz#3c9bb332a3de55ab200dbefd3411e3b0d985314f" + integrity sha512-bWXUBeDzhisYh0clVKx4JgQrZjpn+/QRMRwNsfnRpjCMhgmZ+SL3Bivktd7q03O4uKMMcAOe6bSmppwP9/um0Q== -xterm-addon-search@0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0.tgz#2a00ff7f9848f6140e7c4d1782486b0b18b06e0d" - integrity sha512-6U4uHXcQ7G5igsdaGqrJ9ehm7vep24bXqWxuy3AnIosXF2Z5uy2MvmYRyTGNembIqPV/x1YhBQ7uShtuqBHhOQ== +xterm-addon-search@0.13.0-beta.4: + version "0.13.0-beta.4" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.13.0-beta.4.tgz#a9817600cc0a71dee524d0f025e88e013f87f14a" + integrity sha512-A9Ps7iqGVUSphLCVrGYrfua1ADjtm9ff5CLs8cpiZnMK45X1FTIrXxEWvFccoiwtmZINEDJPGvbfIIqu8ZkXyg== xterm-addon-unicode11@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0.tgz#41c0d96acc1e3bb6c6596eee64e163b6bca74be7" integrity sha512-Jm4/g4QiTxiKiTbYICQgC791ubhIZyoIwxAIgOW8z8HWFNY+lwk+dwaKEaEeGBfM48Vk8fklsUW9u/PlenYEBg== -xterm-addon-webgl@0.15.0-beta.10: - version "0.15.0-beta.10" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.10.tgz#39ebbfb1b89c6773a2d8cb8e1d2f3ef1f08b28f9" - integrity sha512-JVv4t5q6QGWyLiEAcAk9H2B83hFlIalzEwWu1VVYso0MJyZAlZ0NP5Za03iSKxYi7RQIA5bOe8r7W24esQDjLg== +xterm-addon-webgl@0.16.0-beta.6: + version "0.16.0-beta.6" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.16.0-beta.6.tgz#5f8a598081a117dec15b4ead8160bf8e972fbfd0" + integrity sha512-bRFahQyVuiRmeakLzTrs3V3KSWBDOcePfT/Q7dwWfh8NPpilg6/Zm04ijq99Nsg1AYbfNWh+P05Myppa8uimCA== -xterm@5.2.0-beta.41: - version "5.2.0-beta.41" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.41.tgz#ff9f5ed8890a751db2263ebdd362f5443699026d" - integrity sha512-yvDMaeELF8YuqTv220/+i5MKvy9GB4Vu7tH1T3OIqPvHwgnC8SY1vOSjskxHsHsRE5qLluiQJo6/wvt3kZH8+A== +xterm@5.3.0-beta.24: + version "5.3.0-beta.24" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.3.0-beta.24.tgz#ba8762b66cba543de13c70eaa2e5e2687060c6b3" + integrity sha512-XMk54jwvWJKJVVBm0wh2SCUB9vnXzg872yAytEKlspEWim62nM1lMfYMI/yNjr5RhL3YtBNOR4ewE4ubfhUINA== diff --git a/remote/yarn.lock b/remote/yarn.lock index 3163ac74da1..635d40dc759 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -48,34 +48,34 @@ node-addon-api "^3.2.1" node-gyp-build "^4.3.0" -"@tootallnate/once@1", "@tootallnate/once@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@tootallnate/once@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-3.0.0.tgz#d52238c9052d746c9689523e650160e70786bc9a" + integrity sha512-OAdBVB7rlwvLD+DiecSAyVKzKVmSfXbouCyM5I6wHGi4MGXIyFqErg1IvyJ7PI1e+GYZuZh7cCHV/c4LA8SKMw== "@vscode/iconv-lite-umd@0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48" integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg== -"@vscode/proxy-agent@^0.13.2": - version "0.13.2" - resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.13.2.tgz#0d289826c07faecc4ca07de80a8e5a9459d06119" - integrity sha512-BSUd0NTj44WvG4O9A6N+4R1XhxtPqCYltWeHyNkquX9T//a1US+cd8fxzcZCPd3z7dygdYIPkZAKM+CrefWWOA== +"@vscode/proxy-agent@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.17.2.tgz#0e0dac24478e2d71a4fd1b2bb5f84dc61add79e2" + integrity sha512-aKRo1YfUCsgEjHvr2HXfM6dwHhieyO6G+WHly7jewyyTJ1nANWEocS3JRnRbC4KjlajKhSUEOx838cdnY/vRtA== dependencies: - "@tootallnate/once" "^1.1.2" - agent-base "^6.0.2" - debug "^4.3.1" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" - socks-proxy-agent "^5.0.0" + "@tootallnate/once" "^3.0.0" + agent-base "^7.0.1" + debug "^4.3.4" + http-proxy-agent "^7.0.0" + https-proxy-agent "^7.0.1" + socks-proxy-agent "^8.0.1" optionalDependencies: "@vscode/windows-ca-certs" "^0.3.1" -"@vscode/ripgrep@^1.15.3": - version "1.15.3" - resolved "https://registry.yarnpkg.com/@vscode/ripgrep/-/ripgrep-1.15.3.tgz#bd53c555ed7f2f546edc46a47d72b1914a5ba23d" - integrity sha512-fCJP+4MRnhSTWw+GYAH93kSIomWYvdSe5206IqcHofBFcaFKR51XQNU0D5RB26Ps/5zRf5AQS26DIqqbMsB1Cw== +"@vscode/ripgrep@^1.15.5": + version "1.15.5" + resolved "https://registry.yarnpkg.com/@vscode/ripgrep/-/ripgrep-1.15.5.tgz#26025884bbc3a8b40dfc29f5bda4b87b47bd7356" + integrity sha512-PVvKNEmtnlek3i4MJMaB910dz46CKQqcIY2gKR3PSlfz/ZPlSYuSuyQMS7iK20KL4hGUdSbWt964B5S5EIojqw== dependencies: https-proxy-agent "^5.0.0" proxy-from-env "^1.1.0" @@ -101,17 +101,17 @@ dependencies: node-addon-api "^3.0.2" -"@vscode/windows-process-tree@0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@vscode/windows-process-tree/-/windows-process-tree-0.4.2.tgz#54d010fdeb06dfe3a9c6d58fcb3ed9acfc962f33" - integrity sha512-b20865s1HG1VtGt887KrB1blwFS6p4L1Fl1o/WplO9j7sGBle8sLqkNnGXbCaRNgdIgfXtitmzG366FVynJZdQ== +"@vscode/windows-process-tree@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@vscode/windows-process-tree/-/windows-process-tree-0.5.0.tgz#b8205b862c75a1e0ad8b7bf4350dc85036ee3a2c" + integrity sha512-y8Oliel/rBSYh9f1T4F0zQjJNPeJRgYRhEKZsjas7JXKLf46FpE3Ux8e9+7HelUD8dXFH7C7N6895nU0WhrMlg== dependencies: nan "^2.17.0" -"@vscode/windows-registry@1.0.10": - version "1.0.10" - resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.0.10.tgz#17e4e2f8fdd41990206d1bab2daf99c803206247" - integrity sha512-n2rLdTgv95fQUpDxZqgAURg9neQGymtOKkLW4eYP2SODmaxoL2WzgrxEz1kW0w5TI+J4tsPeuZylpRfrDJKQWw== +"@vscode/windows-registry@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9" + integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw== agent-base@4: version "4.2.0" @@ -120,7 +120,7 @@ agent-base@4: dependencies: es6-promisify "^5.0.0" -agent-base@6, agent-base@^6.0.2: +agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -134,6 +134,13 @@ agent-base@^4.3.0: dependencies: es6-promisify "^5.0.0" +agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434" + integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg== + dependencies: + debug "^4.3.4" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -237,10 +244,10 @@ debug@4: dependencies: ms "^2.1.1" -debug@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== +debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" @@ -338,10 +345,10 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -graceful-fs@4.2.8: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== +graceful-fs@4.2.11: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== has-unicode@^2.0.0: version "2.0.1" @@ -356,14 +363,13 @@ http-proxy-agent@^2.1.0: agent-base "4" debug "3.1.0" -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== +http-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673" + integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ== dependencies: - "@tootallnate/once" "1" - agent-base "6" - debug "4" + agent-base "^7.1.0" + debug "^4.3.4" https-proxy-agent@^2.2.3: version "2.2.4" @@ -381,6 +387,14 @@ https-proxy-agent@^5.0.0: agent-base "6" debug "4" +https-proxy-agent@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz#0277e28f13a07d45c663633841e20a40aaafe0ab" + integrity sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ== + dependencies: + agent-base "^7.0.2" + debug "4" + ieee754@^1.1.13: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" @@ -396,10 +410,10 @@ ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== is-extglob@^2.1.1: version "2.1.1" @@ -440,6 +454,15 @@ jschardet@3.0.0: resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-3.0.0.tgz#898d2332e45ebabbdb6bf2feece9feea9a99e882" integrity sha512-lJH6tJ77V8Nzd5QWRkFYCLc13a3vADkh3r/Fi8HupZGWk2OVVDfnZP8V/VgQgZ+lzW0kG2UGb5hFgt3V3ndotQ== +kerberos@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/kerberos/-/kerberos-2.0.1.tgz#663b0b46883b4da84495f60f2e9e399a43a33ef5" + integrity sha512-O/jIgbdGK566eUhFwIcgalbqirYU/r76MW7/UFw06Fd9x5bSwgyZWL/Vm26aAmezQww/G9KYkmmJBkEkPk5HLw== + dependencies: + bindings "^1.5.0" + node-addon-api "^4.3.0" + prebuild-install "7.1.1" + keytar@7.9.0: version "7.9.0" resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb" @@ -537,10 +560,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== -node-pty@0.11.0-beta32: - version "0.11.0-beta32" - resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.11.0-beta32.tgz#49c0f174f600ac3f54a21df2a41b6f78256ff6ce" - integrity sha512-xtzB4/jYH64ksdVatYQnaU3TtCtSaDiiZPsZITmLHnywFSpI2bgfyj/bu6ofOXbe8PTtziL8bDn1U3xkRmx3mg== +node-pty@1.1.0-beta1: + version "1.1.0-beta1" + resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta1.tgz#95d4baf406c043b78042f951b325e9713df2beac" + integrity sha512-h+1E/gX/brFqsp3yZKGERHOhdo1POG1rrsI+8tEuocqdEddHd029471gq8KOuiHKicd52h2pSU8Gtqb3Vo2PfQ== dependencies: nan "^2.17.0" @@ -581,6 +604,24 @@ picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +prebuild-install@7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45" + integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw== + dependencies: + detect-libc "^2.0.0" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + prebuild-install@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz#c10075727c318efe72412f333e0ef625beaf3870" @@ -661,9 +702,9 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" @@ -691,27 +732,27 @@ simple-get@^4.0.0: once "^1.3.1" simple-concat "^1.0.0" -smart-buffer@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba" - integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw== +smart-buffer@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -socks-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60" - integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA== +socks-proxy-agent@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz#ffc5859a66dac89b0c4dab90253b96705f3e7120" + integrity sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ== dependencies: - agent-base "6" - debug "4" - socks "^2.3.3" + agent-base "^7.0.1" + debug "^4.3.4" + socks "^2.7.1" -socks@^2.3.3: - version "2.6.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" - integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== +socks@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== dependencies: - ip "^1.1.5" - smart-buffer "^4.1.0" + ip "^2.0.0" + smart-buffer "^4.2.0" string-width@^1.0.1: version "1.0.2" @@ -836,45 +877,45 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -xterm-addon-canvas@0.4.0-beta.11: - version "0.4.0-beta.11" - resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.4.0-beta.11.tgz#d627050d7e2290ae804c0ec730d5bfc5861afd78" - integrity sha512-yfkx0R7wB3L+fWf1doDmEfwYIeNMVq4uXlq7sCvfPQAVA2H4eOH/s+SS1mhyy0A6DDEbM4eEQ7CroRZIsnVtMA== +xterm-addon-canvas@0.5.0-beta.7: + version "0.5.0-beta.7" + resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.5.0-beta.7.tgz#27a6753a0d8551248bffb15c29d5d88bf6b2a071" + integrity sha512-33a8kSR/uirSrtPkNiCO5MnRwuvR0hTvm1K+541XDsa9QS0VF0xPZoC4MEWHHXfSMzrTFgx1edpXqYOKc2yWtw== -xterm-addon-image@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.4.0.tgz#36e98fa892db11755a5f6e9654f924e876e29bf8" - integrity sha512-3wumCJo4WTzxvecSMxJ7XtpVQeFe4gE2cdHCyUdo7zagVkS18YXJacGx6DjlAIccdJn6/LhGuD99xOSSvYx9Gw== +xterm-addon-image@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.5.0.tgz#3c9bb332a3de55ab200dbefd3411e3b0d985314f" + integrity sha512-bWXUBeDzhisYh0clVKx4JgQrZjpn+/QRMRwNsfnRpjCMhgmZ+SL3Bivktd7q03O4uKMMcAOe6bSmppwP9/um0Q== -xterm-addon-search@0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0.tgz#2a00ff7f9848f6140e7c4d1782486b0b18b06e0d" - integrity sha512-6U4uHXcQ7G5igsdaGqrJ9ehm7vep24bXqWxuy3AnIosXF2Z5uy2MvmYRyTGNembIqPV/x1YhBQ7uShtuqBHhOQ== +xterm-addon-search@0.13.0-beta.4: + version "0.13.0-beta.4" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.13.0-beta.4.tgz#a9817600cc0a71dee524d0f025e88e013f87f14a" + integrity sha512-A9Ps7iqGVUSphLCVrGYrfua1ADjtm9ff5CLs8cpiZnMK45X1FTIrXxEWvFccoiwtmZINEDJPGvbfIIqu8ZkXyg== -xterm-addon-serialize@0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.9.0.tgz#3eee5f5c34b16e48891ec59b213716bab2354bf4" - integrity sha512-qJju2YJFh8c8pbtCYtHaG7gDDHBpDJ4a4JQZvOzuiMxOjgeM1oCnFNjbhzMuK/fOUa59FmvIUGQyqn3WL9q7qw== +xterm-addon-serialize@0.11.0-beta.6: + version "0.11.0-beta.6" + resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.11.0-beta.6.tgz#2533a2f6bf41327cfcc51a92fca79404499cffe2" + integrity sha512-wXx3j9Nf+JOxoBW8iZElEPVEBD6LRDlnrGhfe4oSEa+wDJX+8iORcIKH06mNBlwSApajawrDhpcugwAhjvSOHg== xterm-addon-unicode11@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0.tgz#41c0d96acc1e3bb6c6596eee64e163b6bca74be7" integrity sha512-Jm4/g4QiTxiKiTbYICQgC791ubhIZyoIwxAIgOW8z8HWFNY+lwk+dwaKEaEeGBfM48Vk8fklsUW9u/PlenYEBg== -xterm-addon-webgl@0.15.0-beta.10: - version "0.15.0-beta.10" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.10.tgz#39ebbfb1b89c6773a2d8cb8e1d2f3ef1f08b28f9" - integrity sha512-JVv4t5q6QGWyLiEAcAk9H2B83hFlIalzEwWu1VVYso0MJyZAlZ0NP5Za03iSKxYi7RQIA5bOe8r7W24esQDjLg== +xterm-addon-webgl@0.16.0-beta.6: + version "0.16.0-beta.6" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.16.0-beta.6.tgz#5f8a598081a117dec15b4ead8160bf8e972fbfd0" + integrity sha512-bRFahQyVuiRmeakLzTrs3V3KSWBDOcePfT/Q7dwWfh8NPpilg6/Zm04ijq99Nsg1AYbfNWh+P05Myppa8uimCA== -xterm-headless@5.2.0-beta.41: - version "5.2.0-beta.41" - resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.2.0-beta.41.tgz#17085c0ef255214c244bdaa73e5914fd722be28e" - integrity sha512-cAKuiYPs2GQpCWFIWHakRF+57vPDmqLzMFX3kOcMj+deHPuDnxucQTZvjxKNbMZKG9u9r+shIyfGzgC0oA+bBw== +xterm-headless@5.3.0-beta.24: + version "5.3.0-beta.24" + resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.3.0-beta.24.tgz#53fd4cb1074df32b8380f8648e27b30402afbf52" + integrity sha512-POltAlizoSkgbjxloTkmn0Rzwh0viOdM6kpRir8yorSOMctOWXe94tNL2vgdEJxXRvMLFo8wXNjFz0g7N4wZ8w== -xterm@5.2.0-beta.41: - version "5.2.0-beta.41" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.41.tgz#ff9f5ed8890a751db2263ebdd362f5443699026d" - integrity sha512-yvDMaeELF8YuqTv220/+i5MKvy9GB4Vu7tH1T3OIqPvHwgnC8SY1vOSjskxHsHsRE5qLluiQJo6/wvt3kZH8+A== +xterm@5.3.0-beta.24: + version "5.3.0-beta.24" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.3.0-beta.24.tgz#ba8762b66cba543de13c70eaa2e5e2687060c6b3" + integrity sha512-XMk54jwvWJKJVVBm0wh2SCUB9vnXzg872yAytEKlspEWim62nM1lMfYMI/yNjr5RhL3YtBNOR4ewE4ubfhUINA== yallist@^4.0.0: version "4.0.0" diff --git a/resources/linux/snap/electron-launch b/resources/linux/snap/electron-launch index fd18e11e443..873b079161a 100755 --- a/resources/linux/snap/electron-launch +++ b/resources/linux/snap/electron-launch @@ -47,6 +47,15 @@ function append_dir() { fi } +function copy_env_variable() { + local -n var="$1" + if [[ "+$var" ]]; then + export "${!var}_VSCODE_SNAP_ORIG=${var}" + else + export "${!var}_VSCODE_SNAP_ORIG=''" + fi +} + # shellcheck source=/dev/null source "$SNAP_USER_DATA/.last_revision" 2>/dev/null || true if [ "$SNAP_DESKTOP_LAST_REVISION" = "$SNAP_VERSION" ]; then @@ -84,6 +93,19 @@ function can_open_file() { [ -f "$1" ] && [ -r "$1" ] } +# Preserve system variables that get modified below +copy_env_variable XDG_CONFIG_DIRS +copy_env_variable XDG_DATA_DIRS +copy_env_variable LOCPATH +copy_env_variable GIO_MODULE_DIR +copy_env_variable GSETTINGS_SCHEMA_DIR +copy_env_variable GDK_PIXBUF_MODULE_FILE +copy_env_variable GDK_PIXBUF_MODULEDIR +copy_env_variable GDK_BACKEND +copy_env_variable GTK_PATH +copy_env_variable GTK_EXE_PREFIX +copy_env_variable GTK_IM_MODULE_FILE + # XDG Config prepend_dir XDG_CONFIG_DIRS "$SNAP/etc/xdg" diff --git a/resources/linux/snap/snapcraft.yaml b/resources/linux/snap/snapcraft.yaml index 0b1cfc7053a..b7b93f4c59c 100644 --- a/resources/linux/snap/snapcraft.yaml +++ b/resources/linux/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: @@NAME@@ -version: @@VERSION@@ +version: '@@VERSION@@' summary: Code editing. Redefined. description: | Visual Studio Code is a new choice of tool that combines the diff --git a/resources/server/bin/server-old.cmd b/resources/server/bin/server-old.cmd deleted file mode 100644 index 3b459b30d37..00000000000 --- a/resources/server/bin/server-old.cmd +++ /dev/null @@ -1,24 +0,0 @@ -@echo off -setlocal - -set ROOT_DIR=%~dp0 - -set _FIRST_ARG=%1 -if "%_FIRST_ARG:~0,9%"=="--inspect" ( - set INSPECT=%1 - shift -) else ( - set INSPECT= -) - -:loop1 -if "%~1"=="" goto after_loop -set RESTVAR=%RESTVAR% %1 -shift -goto loop1 - -:after_loop - -"%ROOT_DIR%node.exe" %INSPECT% "%ROOT_DIR%out\server-main.js" --compatibility=1.63 %RESTVAR% - -endlocal diff --git a/resources/server/bin/server-old.sh b/resources/server/bin/server-old.sh deleted file mode 100644 index 7861d790be3..00000000000 --- a/resources/server/bin/server-old.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env sh -# -# Copyright (c) Microsoft Corporation. All rights reserved. -# - -case "$1" in - --inspect*) INSPECT="$1"; shift;; -esac - -ROOT="$(dirname "$0")" - -"$ROOT/node" ${INSPECT:-} "$ROOT/out/server-main.js" --compatibility=1.63 "$@" diff --git a/scripts/code.sh b/scripts/code.sh index 08fc867ca12..2b97aa42fa4 100755 --- a/scripts/code.sh +++ b/scripts/code.sh @@ -75,6 +75,12 @@ if [ "$IN_WSL" == "true" ] && [ -z "$DISPLAY" ]; then code-wsl "$@" elif [ -f /mnt/wslg/versions.txt ]; then code --disable-gpu "$@" +elif [ -f /.dockerenv ]; then + # Workaround for https://bugs.chromium.org/p/chromium/issues/detail?id=1263267 + # Chromium does not release shared memory when streaming scripts + # which might exhaust the available resources in the container environment + # leading to failed script loading. + code --disable-dev-shm-usage "$@" else code "$@" fi diff --git a/scripts/playground-server.ts b/scripts/playground-server.ts index 133bd375d89..1c2074ee191 100644 --- a/scripts/playground-server.ts +++ b/scripts/playground-server.ts @@ -23,10 +23,9 @@ function main() { const editorMainBundle = new CachedBundle('vs/editor/editor.main', moduleIdMapper); fileServer.overrideFileContent(editorMainBundle.entryModulePath, () => editorMainBundle.bundle()); - const hotReloadJsCode = getHotReloadCode(new URL('/file-changes', server.url)); const loaderPath = path.join(rootDir, 'out/vs/loader.js'); fileServer.overrideFileContent(loaderPath, async () => - Buffer.from(new TextEncoder().encode(`${await fsPromise.readFile(loaderPath, 'utf8')}\n${hotReloadJsCode}`)) + Buffer.from(new TextEncoder().encode(makeLoaderJsHotReloadable(await fsPromise.readFile(loaderPath, 'utf8'), new URL('/file-changes', server.url)))) ); const watcher = DirWatcher.watchRecursively(moduleIdMapper.rootDir); @@ -35,7 +34,7 @@ function main() { editorMainBundle.bundle(); console.log(`${new Date().toLocaleTimeString()}, file change: ${path}`); }); - server.use('/file-changes', handleGetFileChangesRequest(watcher, fileServer)); + server.use('/file-changes', handleGetFileChangesRequest(watcher, fileServer, moduleIdMapper)); console.log(`Server listening on ${server.url}`); } @@ -169,6 +168,12 @@ function getContentType(filePath: string): string { return 'image/png'; case '.jpg': return 'image/jpg'; + case '.svg': + return 'image/svg+xml'; + case '.html': + return 'text/html'; + case '.wasm': + return 'application/wasm'; default: return 'text/plain'; } @@ -215,56 +220,109 @@ class DirWatcher { } } -function handleGetFileChangesRequest(watcher: DirWatcher, fileServer: FileServer): ChainableRequestHandler { +function handleGetFileChangesRequest(watcher: DirWatcher, fileServer: FileServer, moduleIdMapper: SimpleModuleIdPathMapper): ChainableRequestHandler { return async (req, res) => { res.writeHead(200, { 'Content-Type': 'text/plain' }); const d = watcher.onDidChange(fsPath => { const path = fileServer.filePathToUrlPath(fsPath); if (path) { - res.write(JSON.stringify({ changedPath: path }) + '\n'); + res.write(JSON.stringify({ changedPath: path, moduleId: moduleIdMapper.getModuleId(fsPath) }) + '\n'); } }); res.on('close', () => d.dispose()); }; } +function makeLoaderJsHotReloadable(loaderJsCode: string, fileChangesUrl: URL): string { + loaderJsCode = loaderJsCode.replace( + /constructor\(env, scriptLoader, defineFunc, requireFunc, loaderAvailableTimestamp = 0\) {/, + '$&globalThis.___globalModuleManager = this;' + ); -function getHotReloadCode(fileChangesUrl: URL): string { - const additionalJsCode = ` -function $watchChanges() { - console.log("Connecting to server to watch for changes..."); - fetch(${JSON.stringify(fileChangesUrl)}) - .then(async request => { - const reader = request.body.getReader(); - let buffer = ''; - while (true) { - const { done, value } = await reader.read(); - if (done) { break; } - buffer += new TextDecoder().decode(value); - const lines = buffer.split('\\n'); - buffer = lines.pop(); - for (const line of lines) { - const data = JSON.parse(line); - if (data.changedPath.endsWith('.css')) { - console.log('css changed', data.changedPath); - const styleSheet = [...document.querySelectorAll("link[rel='stylesheet']")].find(l => new URL(l.href, document.location.href).pathname.endsWith(data.changedPath)); - if (styleSheet) { - styleSheet.href = styleSheet.href.replace(/\\?.*/, '') + '?' + Date.now(); + const ___globalModuleManager: any = undefined; + + // This code will be appended to loader.js + function $watchChanges(fileChangesUrl: string) { + let reloadFn; + if (globalThis.$sendMessageToParent) { + reloadFn = () => globalThis.$sendMessageToParent({ kind: 'reload' }); + } else if (typeof window !== 'undefined') { + reloadFn = () => window.location.reload(); + } else { + reloadFn = () => { }; + } + + console.log('Connecting to server to watch for changes...'); + (fetch as any)(fileChangesUrl) + .then(async request => { + const reader = request.body.getReader(); + let buffer = ''; + while (true) { + const { done, value } = await reader.read(); + if (done) { break; } + buffer += new TextDecoder().decode(value); + const lines = buffer.split('\n'); + buffer = lines.pop()!; + for (const line of lines) { + const data = JSON.parse(line); + let handled = false; + if (data.changedPath.endsWith('.css')) { + if (typeof document !== 'undefined') { + console.log('css changed', data.changedPath); + const styleSheet = [...document.querySelectorAll(`link[rel='stylesheet']`)].find((l: any) => new URL(l.href, document.location.href).pathname.endsWith(data.changedPath)) as any; + if (styleSheet) { + styleSheet.href = styleSheet.href.replace(/\?.*/, '') + '?' + Date.now(); + } + } + handled = true; + } else if (data.changedPath.endsWith('.js') && data.moduleId) { + console.log('js changed', data.changedPath); + const moduleId = ___globalModuleManager._moduleIdProvider.getModuleId(data.moduleId); + if (___globalModuleManager._modules2[moduleId]) { + const srcUrl = ___globalModuleManager._config.moduleIdToPaths(data.moduleId); + const newSrc = await (await fetch(srcUrl)).text(); + (new Function('define', newSrc))(function (deps, callback) { // CodeQL [SM01632] This code is only executed during development (as part of the dev-only playground-server). It is required for the hot-reload functionality. + const oldModule = ___globalModuleManager._modules2[moduleId]; + delete ___globalModuleManager._modules2[moduleId]; + + ___globalModuleManager.defineModule(data.moduleId, deps, callback); + const newModule = ___globalModuleManager._modules2[moduleId]; + const oldExports = { ...oldModule.exports }; + + Object.assign(oldModule.exports, newModule.exports); + newModule.exports = oldModule.exports; + + handled = true; + + for (const cb of [...globalThis.$hotReload_deprecateExports]) { + cb(oldExports, newModule.exports); + } + + if (handled) { + console.log('hot reloaded', data.moduleId); + } + }); + } } - } else { - $sendMessageToParent({ kind: "reload" }); + + if (!handled) { reloadFn(); } } } - } - }) - .catch(err => { - console.error(err); - setTimeout($watchChanges, 1000); - }); + }).catch(err => { + console.error(err); + setTimeout(() => $watchChanges(fileChangesUrl), 1000); + }); -} -$watchChanges(); + } + + const additionalJsCode = ` +(${(function () { + globalThis.$hotReload_deprecateExports = new Set<(oldExports: any, newExports: any) => void>(); + }).toString()})(); +${$watchChanges.toString()} +$watchChanges(${JSON.stringify(fileChangesUrl)}); `; - return additionalJsCode; + + return `${loaderJsCode}\n${additionalJsCode}`; } // #endregion diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat index e5b356f3dec..55d7202968f 100644 --- a/scripts/test-integration.bat +++ b/scripts/test-integration.bat @@ -82,6 +82,13 @@ mkdir %IPYNBWORKSPACE% call "%INTEGRATION_TEST_ELECTRON_PATH%" %IPYNBWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\ipynb --extensionTestsPath=%~dp0\..\extensions\ipynb\out\test %API_TESTS_EXTRA_ARGS% if %errorlevel% neq 0 exit /b %errorlevel% +echo. +echo ### Notebook Output tests +set NBOUTWORKSPACE=%TEMPDIR%\nbout-%RANDOM% +mkdir %NBOUTWORKSPACE% +call "%INTEGRATION_TEST_ELECTRON_PATH%" %NBOUTWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\notebook-renderers --extensionTestsPath=%~dp0\..\extensions\notebook-renderers\out\test %API_TESTS_EXTRA_ARGS% +if %errorlevel% neq 0 exit /b %errorlevel% + echo. echo ### Configuration editing tests set CFWORKSPACE=%TEMPDIR%\cf-%RANDOM% diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh index e43ef46016c..b6f3ec01538 100755 --- a/scripts/test-integration.sh +++ b/scripts/test-integration.sh @@ -100,6 +100,12 @@ echo "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/ipynb --extensionTestsPath=$ROOT/extensions/ipynb/out/test $API_TESTS_EXTRA_ARGS kill_app +echo +echo "### Notebook Output tests" +echo +"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/notebook-renderers --extensionTestsPath=$ROOT/extensions/notebook-renderers/out/test $API_TESTS_EXTRA_ARGS +kill_app + echo echo "### Configuration editing tests" echo diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js index c9f1b4a9583..66da7fb0e41 100644 --- a/src/bootstrap-window.js +++ b/src/bootstrap-window.js @@ -88,9 +88,6 @@ window['MonacoEnvironment'] = {}; - // VSCODE_GLOBALS: node_modules - globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => (require.__$__nodeRequire ?? require)(String(mod)) }); - const loaderConfig = { baseUrl: `${bootstrapLib.fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out`, 'vs/nls': nlsConfig, @@ -114,10 +111,12 @@ loaderConfig.paths = { 'vscode-textmate': `${baseNodeModulesPath}/vscode-textmate/release/main.js`, 'vscode-oniguruma': `${baseNodeModulesPath}/vscode-oniguruma/release/main.js`, + 'vsda': `${baseNodeModulesPath}/vsda/index.js`, 'xterm': `${baseNodeModulesPath}/xterm/lib/xterm.js`, 'xterm-addon-canvas': `${baseNodeModulesPath}/xterm-addon-canvas/lib/xterm-addon-canvas.js`, 'xterm-addon-image': `${baseNodeModulesPath}/xterm-addon-image/lib/xterm-addon-image.js`, 'xterm-addon-search': `${baseNodeModulesPath}/xterm-addon-search/lib/xterm-addon-search.js`, + 'xterm-addon-serialize': `${baseNodeModulesPath}/xterm-addon-serialize/lib/xterm-addon-serialize.js`, 'xterm-addon-unicode11': `${baseNodeModulesPath}/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`, 'xterm-addon-webgl': `${baseNodeModulesPath}/xterm-addon-webgl/lib/xterm-addon-webgl.js`, '@vscode/iconv-lite-umd': `${baseNodeModulesPath}/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js`, diff --git a/src/bootstrap.js b/src/bootstrap.js index 0617532bd58..bd0e92e672c 100644 --- a/src/bootstrap.js +++ b/src/bootstrap.js @@ -23,6 +23,7 @@ const Module = typeof require === 'function' ? require('module') : undefined; const path = typeof require === 'function' ? require('path') : undefined; const fs = typeof require === 'function' ? require('fs') : undefined; + const util = typeof require === 'function' ? require('util') : undefined; //#region global bootstrapping @@ -222,8 +223,8 @@ return ipcRenderer.invoke('vscode:readNlsFile', ...pathSegments); } - if (fs && path) { - return (await fs.promises.readFile(path.join(...pathSegments))).toString(); + if (fs && path && util) { + return (await util.promisify(fs.readFile)(path.join(...pathSegments))).toString(); } throw new Error('Unsupported operation (read NLS files)'); @@ -240,8 +241,8 @@ return ipcRenderer.invoke('vscode:writeNlsFile', path, content); } - if (fs) { - return fs.promises.writeFile(path, content); + if (fs && util) { + return util.promisify(fs.writeFile)(path, content); } throw new Error('Unsupported operation (write NLS files)'); diff --git a/src/buildfile.js b/src/buildfile.js index 3f384d2a082..f03de33fb3d 100644 --- a/src/buildfile.js +++ b/src/buildfile.js @@ -5,7 +5,7 @@ /** * @param {string} name - * @param {string[]} exclude + * @param {string[]=} exclude */ function createModuleDescription(name, exclude) { @@ -53,7 +53,7 @@ exports.workerProfileAnalysis = [createEditorWorkerModuleDescription('vs/platfor exports.workbenchDesktop = [ createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'), - createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/worker/textMate.worker'), + createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'), createModuleDescription('vs/workbench/contrib/debug/node/telemetryApp'), createModuleDescription('vs/platform/files/node/watcher/watcherMain'), createModuleDescription('vs/platform/terminal/node/ptyHostMain'), @@ -62,7 +62,7 @@ exports.workbenchDesktop = [ exports.workbenchWeb = [ createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'), - createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/worker/textMate.worker'), + createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'), createModuleDescription('vs/code/browser/workbench/workbench', ['vs/workbench/workbench.web.main']) ]; diff --git a/src/main.js b/src/main.js index d986fee6f6d..55200575103 100644 --- a/src/main.js +++ b/src/main.js @@ -27,17 +27,33 @@ const { getUNCHost, addUNCHostToAllowlist } = require('./vs/base/node/unc'); const product = require('../product.json'); const { app, protocol, crashReporter, Menu } = require('electron'); -// Enable sandbox globally -app.enableSandbox(); - // Enable portable support const portable = bootstrapNode.configurePortable(product); // Enable ASAR support bootstrap.enableASARSupport(); -// Set userData path before app 'ready' event const args = parseCLIArgs(); +// Configure static command line arguments +const argvConfig = configureCommandlineSwitchesSync(args); +// Enable sandbox globally unless +// 1) disabled via command line using either +// `--no-sandbox` or `--disable-chromium-sandbox` argument. +// 2) argv.json contains `disable-chromium-sandbox: true`. +if (args['sandbox'] && + !args['disable-chromium-sandbox'] && + !argvConfig['disable-chromium-sandbox']) { + app.enableSandbox(); +} else if (app.commandLine.hasSwitch('no-sandbox') && + !app.commandLine.hasSwitch('disable-gpu-sandbox')) { + // Disable GPU sandbox whenever --no-sandbox is used. + app.commandLine.appendSwitch('disable-gpu-sandbox'); +} else { + app.commandLine.appendSwitch('no-sandbox'); + app.commandLine.appendSwitch('disable-gpu-sandbox'); +} + +// Set userData path before app 'ready' event const userDataPath = getUserDataPath(args, product.nameShort ?? 'code-oss-dev'); if (process.platform === 'win32') { const userDataUNCHost = getUNCHost(userDataPath); @@ -50,9 +66,6 @@ app.setPath('userData', userDataPath); // Resolve code cache path const codeCachePath = getCodeCachePath(); -// Configure static command line arguments -const argvConfig = configureCommandlineSwitchesSync(args); - // Disable default menu (https://github.com/electron/electron/issues/35512) Menu.setApplicationMenu(null); @@ -188,7 +201,10 @@ function configureCommandlineSwitchesSync(cliArgs) { 'disable-hardware-acceleration', // override for the color profile to use - 'force-color-profile' + 'force-color-profile', + + // override which password-store is used + 'password-store' ]; if (process.platform === 'linux') { @@ -215,8 +231,12 @@ function configureCommandlineSwitchesSync(cliArgs) { // Append Electron flags to Electron if (SUPPORTED_ELECTRON_SWITCHES.indexOf(argvKey) !== -1) { - // Color profile - if (argvKey === 'force-color-profile') { + if ( + // Color profile + argvKey === 'force-color-profile' || + // Password store + argvKey === 'password-store' + ) { if (argvValue) { app.commandLine.appendSwitch(argvKey, argvValue); } @@ -464,7 +484,16 @@ function parseCLIArgs() { 'locale', 'js-flags', 'crash-reporter-directory' - ] + ], + boolean: [ + 'disable-chromium-sandbox', + ], + default: { + 'sandbox': true + }, + alias: { + 'no-sandbox': 'sandbox' + } }); } diff --git a/src/server-main.js b/src/server-main.js index 360c74aa858..5167527baed 100644 --- a/src/server-main.js +++ b/src/server-main.js @@ -45,12 +45,6 @@ async function start() { return; } - if (parsedArgs['compatibility'] === '1.63') { - console.warn(`server.sh is being replaced by 'bin/${product.serverApplicationName}'. Please migrate to the new command and adopt the following new default behaviors:`); - console.warn('* connection token is mandatory unless --without-connection-token is used'); - console.warn('* host defaults to `localhost`'); - } - /** * @typedef { import('./vs/server/node/remoteExtensionHostAgentServer').IServerAPI } IServerAPI */ diff --git a/src/tsconfig.base.json b/src/tsconfig.base.json index a309a50adaa..c0a2e174591 100644 --- a/src/tsconfig.base.json +++ b/src/tsconfig.base.json @@ -17,29 +17,10 @@ "./vs/*" ] }, + "target": "es2022", + "useDefineForClassFields": false, "lib": [ - "ES2016", - "ES2017.Object", - "ES2017.String", - "ES2017.Intl", - "ES2017.TypedArrays", - "ES2018.AsyncIterable", - "ES2018.AsyncGenerator", - "ES2018.Promise", - "ES2018.Regexp", - "ES2018.Intl", - "ES2019.Array", - "ES2019.Object", - "ES2019.String", - "ES2019.Symbol", - "ES2020.BigInt", - "ES2020.Promise", - "ES2020.String", - "ES2020.Symbol.WellKnown", - "ES2020.Intl", - "ES2021.Promise", - "ES2021.String", - "ES2021.WeakRef", + "ES2022", "DOM", "DOM.Iterable", "WebWorker.ImportScripts" diff --git a/src/tsconfig.json b/src/tsconfig.json index 5587571ab70..df96ed71247 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -7,7 +7,6 @@ "allowJs": true, "resolveJsonModule": true, "outDir": "../out/vs", - "target": "es2021", "types": [ "keytar", "mocha", diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json index ee5771636b0..eb8405c96cb 100644 --- a/src/tsec.exemptions.json +++ b/src/tsec.exemptions.json @@ -1,38 +1,42 @@ { + "ban-document-execcommand": [ + "vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts", + "vs/editor/contrib/clipboard/browser/clipboard.ts" + ], "ban-eval-calls": [ "vs/workbench/api/worker/extHostExtensionService.ts", - "vs/base/worker/workerMain" + "vs/base/worker/workerMain.ts" ], "ban-function-calls": [ "vs/workbench/api/worker/extHostExtensionService.ts", - "vs/base/worker/workerMain", + "vs/base/worker/workerMain.ts", "vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts", "vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts" ], "ban-trustedtypes-createpolicy": [ - "vs/base/browser/dom.ts", - "vs/base/browser/markdownRenderer.ts", - "vs/base/browser/defaultWorkerFactory.ts", + "vs/amdX.ts", + "vs/base/browser/trustedTypes.ts", "vs/base/worker/workerMain.ts", - "vs/editor/contrib/markdownRenderer/browser/markdownRenderer.ts", - "vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts", - "vs/editor/browser/view/domLineBreaksComputer.ts", - "vs/editor/browser/view/viewLayer.ts", - "vs/editor/browser/widget/diffEditorWidget.ts", - "vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts", - "vs/editor/browser/widget/diffReview.ts", - "vs/editor/standalone/browser/colorizer.ts", - "vs/workbench/api/worker/extHostExtensionService.ts", - "vs/workbench/contrib/notebook/browser/view/cellParts/cellDragRenderer.ts", - "vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts", - "vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts" + "vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts" ], "ban-worker-calls": [ "vs/base/browser/defaultWorkerFactory.ts", "vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts" ], + "ban-worker-importscripts": [ + "vs/amdX.ts", + "vs/workbench/services/extensions/worker/polyfillNestedWorker.ts", + "vs/workbench/api/worker/extensionHostWorker.ts", + "vs/base/worker/workerMain.ts" + ], "ban-domparser-parsefromstring": [ "vs/base/browser/markdownRenderer.ts", "vs/base/test/browser/markdownRenderer.test.ts" + ], + "ban-element-setattribute": [ + "**/*.ts" + ], + "ban-element-insertadjacenthtml": [ + "**/*.ts" ] } diff --git a/src/typings/vscode-globals-modules.d.ts b/src/typings/vscode-globals-modules.d.ts index 443c2b687db..c538b99b63f 100644 --- a/src/typings/vscode-globals-modules.d.ts +++ b/src/typings/vscode-globals-modules.d.ts @@ -18,6 +18,8 @@ declare global { net: typeof import('net'); os: typeof import('os'); module: typeof import('module'); + fs: typeof import('fs'), + vm: typeof import('vm'), ['native-watchdog']: typeof import('native-watchdog') perf_hooks: typeof import('perf_hooks'); diff --git a/src/typings/windows-mutex.d.ts b/src/typings/windows-mutex.d.ts deleted file mode 100644 index c76fc074bee..00000000000 --- a/src/typings/windows-mutex.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -// Copied from the `@types/windows-mutex` package. -// The dependency is an optional dependency that is only used on Windows, -// but we need the typings to compile on all platforms. -// The types package exported from DefinitelyTyped also maps to `windows-mutex`, -// whereas we are now using `@vscode/windows-mutex`. -declare module '@vscode/windows-mutex' { - export class Mutex { - constructor(name: string); - isActive(): boolean; - release(): void; - } - - export function isActive(name: string): boolean; -} diff --git a/src/typings/windows-process-tree.d.ts b/src/typings/windows-process-tree.d.ts deleted file mode 100644 index a8708a6cccc..00000000000 --- a/src/typings/windows-process-tree.d.ts +++ /dev/null @@ -1,75 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -// Copied from the `@vscode/windows-process-tree` package. -// The dependency is an optional dependency that is only used on Windows, -// but we need the typings to compile on all platforms. -// The `@types/windows-process-tree` package has also been deprecated. -declare module '@vscode/windows-process-tree' { - export enum ProcessDataFlag { } - - export interface IProcessInfo { - pid: number; - ppid: number; - name: string; - - /** - * The working set size of the process, in bytes. - */ - memory?: number; - - /** - * The string returned is at most 512 chars, strings exceeding this length are truncated. - */ - commandLine?: string; - } - - export interface IProcessCpuInfo extends IProcessInfo { - cpu?: number; - } - - export interface IProcessTreeNode { - pid: number; - name: string; - memory?: number; - commandLine?: string; - children: IProcessTreeNode[]; - } - - /** - * Returns a tree of processes with the rootPid process as the root. - * @param rootPid - The pid of the process that will be the root of the tree. - * @param callback - The callback to use with the returned list of processes. - * @param flags - The flags for what process data should be included. - */ - export function getProcessTree(rootPid: number, callback: (tree: IProcessTreeNode | undefined) => void, flags?: ProcessDataFlag): void; - - namespace getProcessTree { - function __promisify__(rootPid: number, flags?: ProcessDataFlag): Promise; - } - - /** - * Returns a list of processes containing the rootPid process and all of its descendants. - * @param rootPid - The pid of the process of interest. - * @param callback - The callback to use with the returned set of processes. - * @param flags - The flags for what process data should be included. - */ - export function getProcessList(rootPid: number, callback: (processList: IProcessInfo[] | undefined) => void, flags?: ProcessDataFlag): void; - - namespace getProcessList { - function __promisify__(rootPid: number, flags?: ProcessDataFlag): Promise; - } - - /** - * Returns the list of processes annotated with cpu usage information. - * @param processList - The list of processes. - * @param callback - The callback to use with the returned list of processes. - */ - export function getProcessCpuUsage(processList: IProcessInfo[], callback: (processListWithCpu: IProcessCpuInfo[]) => void): void; - - namespace getProcessCpuUsage { - function __promisify__(processList: IProcessInfo[]): Promise; - } -} diff --git a/src/vs/amdX.ts b/src/vs/amdX.ts new file mode 100644 index 00000000000..75b21c60828 --- /dev/null +++ b/src/vs/amdX.ts @@ -0,0 +1,208 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { isESM } from 'vs/base/common/amd'; +import { AppResourcePath, FileAccess, nodeModulesAsarPath, nodeModulesPath } from 'vs/base/common/network'; +import * as platform from 'vs/base/common/platform'; +import { IProductConfiguration } from 'vs/base/common/product'; +import { URI } from 'vs/base/common/uri'; + + +class DefineCall { + constructor( + public readonly id: string | null | undefined, + public readonly dependencies: string[] | null | undefined, + public readonly callback: any + ) { } +} + +class AMDModuleImporter { + public static INSTANCE = new AMDModuleImporter(); + + private readonly _isWebWorker = (typeof self === 'object' && self.constructor && self.constructor.name === 'DedicatedWorkerGlobalScope'); + private readonly _isRenderer = typeof document === 'object'; + + private readonly _defineCalls: DefineCall[] = []; + private _initialized = false; + private _amdPolicy: Pick, 'name' | 'createScriptURL'> | undefined; + + constructor() { } + + private _initialize(): void { + if (this._initialized) { + return; + } + this._initialized = true; + + (globalThis).define = (id: any, dependencies: any, callback: any) => { + if (typeof id !== 'string') { + callback = dependencies; + dependencies = id; + id = null; + } + if (typeof dependencies !== 'object' || !Array.isArray(dependencies)) { + callback = dependencies; + dependencies = null; + } + // if (!dependencies) { + // dependencies = ['require', 'exports', 'module']; + // } + this._defineCalls.push(new DefineCall(id, dependencies, callback)); + }; + + (globalThis).define.amd = true; + + if (this._isRenderer) { + this._amdPolicy = window.trustedTypes?.createPolicy('amdLoader', { + createScriptURL(value) { + if (value.startsWith(window.location.origin)) { + return value; + } + if (value.startsWith('vscode-file://vscode-app')) { + return value; + } + throw new Error(`[trusted_script_src] Invalid script url: ${value}`); + } + }); + } else if (this._isWebWorker) { + this._amdPolicy = (globalThis).trustedTypes?.createPolicy('amdLoader', { + createScriptURL(value: string) { + return value; + } + }); + } + } + + public async load(scriptSrc: string): Promise { + this._initialize(); + const defineCall = await (this._isWebWorker ? this._workerLoadScript(scriptSrc) : this._isRenderer ? this._rendererLoadScript(scriptSrc) : this._nodeJSLoadScript(scriptSrc)); + if (!defineCall) { + throw new Error(`Did not receive a define call from script ${scriptSrc}`); + } + // TODO require, exports, module + if (Array.isArray(defineCall.dependencies) && defineCall.dependencies.length > 0) { + throw new Error(`Cannot resolve dependencies for script ${scriptSrc}. The dependencies are: ${defineCall.dependencies.join(', ')}`); + } + if (typeof defineCall.callback === 'function') { + return defineCall.callback([]); + } else { + return defineCall.callback; + } + } + + private _rendererLoadScript(scriptSrc: string): Promise { + return new Promise((resolve, reject) => { + const scriptElement = document.createElement('script'); + scriptElement.setAttribute('async', 'async'); + scriptElement.setAttribute('type', 'text/javascript'); + + const unbind = () => { + scriptElement.removeEventListener('load', loadEventListener); + scriptElement.removeEventListener('error', errorEventListener); + }; + + const loadEventListener = (e: any) => { + unbind(); + resolve(this._defineCalls.pop()); + }; + + const errorEventListener = (e: any) => { + unbind(); + reject(e); + }; + + scriptElement.addEventListener('load', loadEventListener); + scriptElement.addEventListener('error', errorEventListener); + if (this._amdPolicy) { + scriptSrc = this._amdPolicy.createScriptURL(scriptSrc) as any as string; + } + scriptElement.setAttribute('src', scriptSrc); + document.getElementsByTagName('head')[0].appendChild(scriptElement); + }); + } + + private _workerLoadScript(scriptSrc: string): Promise { + return new Promise((resolve, reject) => { + try { + if (this._amdPolicy) { + scriptSrc = this._amdPolicy.createScriptURL(scriptSrc) as any as string; + } + importScripts(scriptSrc); + resolve(this._defineCalls.pop()); + } catch (err) { + reject(err); + } + }); + } + + private async _nodeJSLoadScript(scriptSrc: string): Promise { + try { + const fs = globalThis._VSCODE_NODE_MODULES['fs']; + const vm = globalThis._VSCODE_NODE_MODULES['vm']; + const module = globalThis._VSCODE_NODE_MODULES['module']; + + const filePath = URI.parse(scriptSrc).fsPath; + const content = fs.readFileSync(filePath).toString(); + const scriptSource = module.wrap(content.replace(/^#!.*/, '')); + const script = new vm.Script(scriptSource); + const compileWrapper = script.runInThisContext(); + compileWrapper.apply(); + return this._defineCalls.pop(); + + } catch (error) { + throw error; + } + } +} + +const cache = new Map>(); + +let _paths: Record = {}; +if (typeof globalThis.require === 'object') { + _paths = (>globalThis.require).paths ?? {}; +} + +/** + * Utility for importing an AMD node module. This util supports AMD and ESM contexts and should be used while the ESM adoption + * is on its way. + * + * e.g. pass in `vscode-textmate/release/main.js` + */ +export async function importAMDNodeModule(nodeModuleName: string, pathInsideNodeModule: string, isBuilt?: boolean): Promise { + if (isESM) { + + if (isBuilt === undefined) { + const product = globalThis._VSCODE_PRODUCT_JSON as unknown as IProductConfiguration; + isBuilt = Boolean((product ?? (globalThis).vscode?.context?.configuration()?.product)?.commit); + } + + if (_paths[nodeModuleName]) { + nodeModuleName = _paths[nodeModuleName]; + } + + const nodeModulePath = `${nodeModuleName}/${pathInsideNodeModule}`; + if (cache.has(nodeModulePath)) { + return cache.get(nodeModulePath)!; + } + let scriptSrc: string; + if (/^\w[\w\d+.-]*:\/\//.test(nodeModulePath)) { + // looks like a URL + // bit of a special case for: src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts + scriptSrc = nodeModulePath; + } else { + const useASAR = (isBuilt && !platform.isWeb); + const actualNodeModulesPath = (useASAR ? nodeModulesAsarPath : nodeModulesPath); + const resourcePath: AppResourcePath = `${actualNodeModulesPath}/${nodeModulePath}`; + scriptSrc = FileAccess.asBrowserUri(resourcePath).toString(true); + } + const result = AMDModuleImporter.INSTANCE.load(scriptSrc); + cache.set(nodeModulePath, result); + return result; + } else { + return await import(nodeModuleName); + } +} diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts index 4194d976db2..2ac4671e497 100644 --- a/src/vs/base/browser/browser.ts +++ b/src/vs/base/browser/browser.ts @@ -16,7 +16,7 @@ class WindowManager { public getZoomLevel(): number { return this._zoomLevel; } - public setZoomLevel(zoomLevel: number, isTrusted: boolean): void { + public setZoomLevel(zoomLevel: number): void { if (this._zoomLevel === zoomLevel) { return; } @@ -159,8 +159,8 @@ export function addMatchMediaChangeListener(query: string | MediaQueryList, call export const PixelRatio = new PixelRatioFacade(); /** A zoom index, e.g. 1, 2, 3 */ -export function setZoomLevel(zoomLevel: number, isTrusted: boolean): void { - WindowManager.INSTANCE.setZoomLevel(zoomLevel, isTrusted); +export function setZoomLevel(zoomLevel: number): void { + WindowManager.INSTANCE.setZoomLevel(zoomLevel); } export function getZoomLevel(): number { return WindowManager.INSTANCE.getZoomLevel(); diff --git a/src/vs/base/browser/contextmenu.ts b/src/vs/base/browser/contextmenu.ts index 8f67c230306..3ab23f5bc9f 100644 --- a/src/vs/base/browser/contextmenu.ts +++ b/src/vs/base/browser/contextmenu.ts @@ -3,11 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems'; import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar'; -import { AnchorAlignment, AnchorAxisAlignment } from 'vs/base/browser/ui/contextview/contextview'; +import { AnchorAlignment, AnchorAxisAlignment, IAnchor } from 'vs/base/browser/ui/contextview/contextview'; import { IAction, IActionRunner } from 'vs/base/common/actions'; import { ResolvedKeybinding } from 'vs/base/common/keybindings'; +import { OmitOptional } from 'vs/base/common/types'; export interface IContextMenuEvent { readonly shiftKey?: boolean; @@ -16,8 +18,21 @@ export interface IContextMenuEvent { readonly metaKey?: boolean; } +/** + * A specific context menu location to position the menu at. + * Uses some TypeScript type tricks to prevent allowing to + * pass in a `MouseEvent` and force people to use `StandardMouseEvent`. + */ +type ContextMenuLocation = OmitOptional & { getModifierState?: never }; + export interface IContextMenuDelegate { - getAnchor(): HTMLElement | { x: number; y: number; width?: number; height?: number }; + /** + * The anchor where to position the context view. + * Use a `HTMLElement` to position the view at the element, + * a `StandardMouseEvent` to position it at the mouse position + * or an `ContextMenuLocation` to position it at a specific location. + */ + getAnchor(): HTMLElement | StandardMouseEvent | ContextMenuLocation; getActions(): readonly IAction[]; getCheckedActionsRepresentation?(action: IAction): 'radio' | 'checkbox'; getActionViewItem?(action: IAction, options: IActionViewItemOptions): IActionViewItem | undefined; diff --git a/src/vs/base/browser/defaultWorkerFactory.ts b/src/vs/base/browser/defaultWorkerFactory.ts index 4fe7e01e806..9cab3604196 100644 --- a/src/vs/base/browser/defaultWorkerFactory.ts +++ b/src/vs/base/browser/defaultWorkerFactory.ts @@ -3,10 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes'; import { COI } from 'vs/base/common/network'; import { IWorker, IWorkerCallback, IWorkerFactory, logOnceWebWorkerWarning } from 'vs/base/common/worker/simpleWorker'; -const ttPolicy = window.trustedTypes?.createPolicy('defaultWorkerFactory', { createScriptURL: value => value }); +const ttPolicy = createTrustedTypesPolicy('defaultWorkerFactory', { createScriptURL: value => value }); export function createBlobWorker(blobUrl: string, options?: WorkerOptions): Worker { if (!blobUrl.startsWith('blob:')) { diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts index 917fa90ca76..249a479504b 100644 --- a/src/vs/base/browser/dom.ts +++ b/src/vs/base/browser/dom.ts @@ -1865,7 +1865,7 @@ export function h(tag: string, ...args: [] | [attributes: { $: string } & Partia el.appendChild(c); } else if (typeof c === 'string') { el.append(c); - } else { + } else if ('root' in c) { Object.assign(result, c); el.appendChild(c.root); } diff --git a/src/vs/base/browser/dompurify/cgmanifest.json b/src/vs/base/browser/dompurify/cgmanifest.json index eac506db4b6..67f049b86c8 100644 --- a/src/vs/base/browser/dompurify/cgmanifest.json +++ b/src/vs/base/browser/dompurify/cgmanifest.json @@ -6,11 +6,11 @@ "git": { "name": "dompurify", "repositoryUrl": "https://github.com/cure53/DOMPurify", - "commitHash": "6cfcdf56269b892550af80baa7c1fa5b680e5db7" + "commitHash": "c96c9df61f1070146c0c13078e85b33d8fed3e51" } }, "license": "Apache 2.0", - "version": "2.3.1" + "version": "3.0.5" } ], "version": 1 diff --git a/src/vs/base/browser/dompurify/dompurify.d.ts b/src/vs/base/browser/dompurify/dompurify.d.ts index 14b0330711c..737515a3cbc 100644 --- a/src/vs/base/browser/dompurify/dompurify.d.ts +++ b/src/vs/base/browser/dompurify/dompurify.d.ts @@ -1,4 +1,4 @@ -// Type definitions for DOM Purify 2.2 +// Type definitions for DOM Purify 3.0 // Project: https://github.com/cure53/DOMPurify // Definitions by: Dave Taylor https://github.com/davetayls // Samira Bazuzi @@ -7,27 +7,49 @@ // Piotr Błażejewicz // Nicholas Ellul // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// Minimum TypeScript Version: 4.5 export as namespace DOMPurify; export = DOMPurify; declare const DOMPurify: createDOMPurifyI; +type WindowLike = Pick< + typeof globalThis, + | 'NodeFilter' + | 'Node' + | 'Element' + | 'HTMLTemplateElement' + | 'DocumentFragment' + | 'HTMLFormElement' + | 'DOMParser' + | 'NamedNodeMap' +>; + interface createDOMPurifyI extends DOMPurify.DOMPurifyI { - (window?: Window): DOMPurify.DOMPurifyI; + (window?: Window | WindowLike): DOMPurify.DOMPurifyI; } declare namespace DOMPurify { interface DOMPurifyI { sanitize(source: string | Node): string; sanitize(source: string | Node, config: Config & { RETURN_TRUSTED_TYPE: true }): TrustedHTML; - sanitize(source: string | Node, config: Config & { RETURN_DOM_FRAGMENT?: false | undefined; RETURN_DOM?: false | undefined }): string; + sanitize( + source: string | Node, + config: Config & { RETURN_DOM_FRAGMENT?: false | undefined; RETURN_DOM?: false | undefined }, + ): string; sanitize(source: string | Node, config: Config & { RETURN_DOM_FRAGMENT: true }): DocumentFragment; sanitize(source: string | Node, config: Config & { RETURN_DOM: true }): HTMLElement; sanitize(source: string | Node, config: Config): string | HTMLElement | DocumentFragment; - addHook(hook: 'uponSanitizeElement', cb: (currentNode: Element, data: SanitizeElementHookEvent, config: Config) => void): void; - addHook(hook: 'uponSanitizeAttribute', cb: (currentNode: Element, data: SanitizeAttributeHookEvent, config: Config) => void): void; + addHook( + hook: 'uponSanitizeElement', + cb: (currentNode: Element, data: SanitizeElementHookEvent, config: Config) => void, + ): void; + addHook( + hook: 'uponSanitizeAttribute', + cb: (currentNode: Element, data: SanitizeAttributeHookEvent, config: Config) => void, + ): void; addHook(hook: HookName, cb: (currentNode: Element, data: HookEvent, config: Config) => void): void; setConfig(cfg: Config): void; @@ -47,18 +69,26 @@ declare namespace DOMPurify { ADD_ATTR?: string[] | undefined; ADD_DATA_URI_TAGS?: string[] | undefined; ADD_TAGS?: string[] | undefined; + ADD_URI_SAFE_ATTR?: string[] | undefined; + ALLOW_ARIA_ATTR?: boolean | undefined; ALLOW_DATA_ATTR?: boolean | undefined; + ALLOW_UNKNOWN_PROTOCOLS?: boolean | undefined; + ALLOW_SELF_CLOSE_IN_ATTR?: boolean | undefined; ALLOWED_ATTR?: string[] | undefined; ALLOWED_TAGS?: string[] | undefined; + ALLOWED_NAMESPACES?: string[] | undefined; + ALLOWED_URI_REGEXP?: RegExp | undefined; FORBID_ATTR?: string[] | undefined; + FORBID_CONTENTS?: string[] | undefined; FORBID_TAGS?: string[] | undefined; FORCE_BODY?: boolean | undefined; + IN_PLACE?: boolean | undefined; KEEP_CONTENT?: boolean | undefined; /** * change the default namespace from HTML to something different */ NAMESPACE?: string | undefined; - RETURN_DOM?: boolean | undefined; + PARSER_MEDIA_TYPE?: string | undefined; RETURN_DOM_FRAGMENT?: boolean | undefined; /** * This defaults to `true` starting DOMPurify 2.2.0. Note that setting it to `false` @@ -66,14 +96,27 @@ declare namespace DOMPurify { * supports Declarative Shadow: DOM https://web.dev/declarative-shadow-dom/ */ RETURN_DOM_IMPORT?: boolean | undefined; + RETURN_DOM?: boolean | undefined; RETURN_TRUSTED_TYPE?: boolean | undefined; - SANITIZE_DOM?: boolean | undefined; - WHOLE_DOCUMENT?: boolean | undefined; - ALLOWED_URI_REGEXP?: RegExp | undefined; SAFE_FOR_TEMPLATES?: boolean | undefined; - ALLOW_UNKNOWN_PROTOCOLS?: boolean | undefined; - USE_PROFILES?: false | { mathMl?: boolean | undefined; svg?: boolean | undefined; svgFilters?: boolean | undefined; html?: boolean | undefined } | undefined; - IN_PLACE?: boolean | undefined; + SANITIZE_DOM?: boolean | undefined; + /** @default false */ + SANITIZE_NAMED_PROPS?: boolean | undefined; + USE_PROFILES?: + | false + | { + mathMl?: boolean | undefined; + svg?: boolean | undefined; + svgFilters?: boolean | undefined; + html?: boolean | undefined; + } + | undefined; + WHOLE_DOCUMENT?: boolean | undefined; + CUSTOM_ELEMENT_HANDLING?: { + tagNameCheck?: RegExp | ((tagName: string) => boolean) | null | undefined; + attributeNameCheck?: RegExp | ((lcName: string) => boolean) | null | undefined; + allowCustomizedBuiltInElements?: boolean | undefined; + }; } type HookName = diff --git a/src/vs/base/browser/dompurify/dompurify.js b/src/vs/base/browser/dompurify/dompurify.js index 7563b15ba44..d43b10a85d1 100644 --- a/src/vs/base/browser/dompurify/dompurify.js +++ b/src/vs/base/browser/dompurify/dompurify.js @@ -1,1366 +1,1622 @@ -/*! @license DOMPurify 2.3.1 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.3.1/LICENSE */ +/*! @license DOMPurify 3.0.5 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.0.5/LICENSE */ -function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } } +const { + entries, + setPrototypeOf, + isFrozen, + getPrototypeOf, + getOwnPropertyDescriptor +} = Object; +let { + freeze, + seal, + create +} = Object; // eslint-disable-line import/no-mutable-exports -var hasOwnProperty = Object.hasOwnProperty, - setPrototypeOf = Object.setPrototypeOf, - isFrozen = Object.isFrozen, - getPrototypeOf = Object.getPrototypeOf, - getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor; -var freeze = Object.freeze, - seal = Object.seal, - create = Object.create; // eslint-disable-line import/no-mutable-exports - -var _ref = typeof Reflect !== 'undefined' && Reflect, - apply = _ref.apply, - construct = _ref.construct; +let { + apply, + construct +} = typeof Reflect !== 'undefined' && Reflect; if (!apply) { - apply = function apply(fun, thisValue, args) { - return fun.apply(thisValue, args); - }; + apply = function apply(fun, thisValue, args) { + return fun.apply(thisValue, args); + }; } if (!freeze) { - freeze = function freeze(x) { - return x; - }; + freeze = function freeze(x) { + return x; + }; } if (!seal) { - seal = function seal(x) { - return x; - }; + seal = function seal(x) { + return x; + }; } if (!construct) { - construct = function construct(Func, args) { - return new (Function.prototype.bind.apply(Func, [null].concat(_toConsumableArray(args))))(); - }; + construct = function construct(Func, args) { + return new Func(...args); + }; } -var arrayForEach = unapply(Array.prototype.forEach); -var arrayPop = unapply(Array.prototype.pop); -var arrayPush = unapply(Array.prototype.push); - -var stringToLowerCase = unapply(String.prototype.toLowerCase); -var stringMatch = unapply(String.prototype.match); -var stringReplace = unapply(String.prototype.replace); -var stringIndexOf = unapply(String.prototype.indexOf); -var stringTrim = unapply(String.prototype.trim); - -var regExpTest = unapply(RegExp.prototype.test); - -var typeErrorCreate = unconstruct(TypeError); - +const arrayForEach = unapply(Array.prototype.forEach); +const arrayPop = unapply(Array.prototype.pop); +const arrayPush = unapply(Array.prototype.push); +const stringToLowerCase = unapply(String.prototype.toLowerCase); +const stringToString = unapply(String.prototype.toString); +const stringMatch = unapply(String.prototype.match); +const stringReplace = unapply(String.prototype.replace); +const stringIndexOf = unapply(String.prototype.indexOf); +const stringTrim = unapply(String.prototype.trim); +const regExpTest = unapply(RegExp.prototype.test); +const typeErrorCreate = unconstruct(TypeError); function unapply(func) { - return function (thisArg) { - for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { - args[_key - 1] = arguments[_key]; - } + return function (thisArg) { + for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { + args[_key - 1] = arguments[_key]; + } - return apply(func, thisArg, args); - }; + return apply(func, thisArg, args); + }; } - function unconstruct(func) { - return function () { - for (var _len2 = arguments.length, args = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { - args[_key2] = arguments[_key2]; - } + return function () { + for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { + args[_key2] = arguments[_key2]; + } - return construct(func, args); - }; + return construct(func, args); + }; } - /* Add properties to a lookup table */ -function addToSet(set, array) { - if (setPrototypeOf) { - // Make 'in' and truthy checks like Boolean(set.constructor) - // independent of any properties defined on Object.prototype. - // Prevent prototype setters from intercepting set as a this value. - setPrototypeOf(set, null); - } - var l = array.length; - while (l--) { - var element = array[l]; - if (typeof element === 'string') { - var lcElement = stringToLowerCase(element); - if (lcElement !== element) { - // Config presets (e.g. tags.js, attrs.js) are immutable. - if (!isFrozen(array)) { - array[l] = lcElement; - } +function addToSet(set, array, transformCaseFunc) { + var _transformCaseFunc; - element = lcElement; - } - } + transformCaseFunc = (_transformCaseFunc = transformCaseFunc) !== null && _transformCaseFunc !== void 0 ? _transformCaseFunc : stringToLowerCase; - set[element] = true; - } + if (setPrototypeOf) { + // Make 'in' and truthy checks like Boolean(set.constructor) + // independent of any properties defined on Object.prototype. + // Prevent prototype setters from intercepting set as a this value. + setPrototypeOf(set, null); + } - return set; + let l = array.length; + + while (l--) { + let element = array[l]; + + if (typeof element === 'string') { + const lcElement = transformCaseFunc(element); + + if (lcElement !== element) { + // Config presets (e.g. tags.js, attrs.js) are immutable. + if (!isFrozen(array)) { + array[l] = lcElement; + } + + element = lcElement; + } + } + + set[element] = true; + } + + return set; } - /* Shallow clone an object */ + function clone(object) { - var newObject = create(null); + const newObject = create(null); - var property = void 0; - for (property in object) { - if (apply(hasOwnProperty, object, [property])) { - newObject[property] = object[property]; - } - } + for (const [property, value] of entries(object)) { + newObject[property] = value; + } - return newObject; + return newObject; } +/* This method automatically checks if the prop is function + * or getter and behaves accordingly. */ -/* IE10 doesn't support __lookupGetter__ so lets' - * simulate it. It also automatically checks - * if the prop is function or getter and behaves - * accordingly. */ function lookupGetter(object, prop) { - while (object !== null) { - var desc = getOwnPropertyDescriptor(object, prop); - if (desc) { - if (desc.get) { - return unapply(desc.get); - } + while (object !== null) { + const desc = getOwnPropertyDescriptor(object, prop); - if (typeof desc.value === 'function') { - return unapply(desc.value); - } - } + if (desc) { + if (desc.get) { + return unapply(desc.get); + } - object = getPrototypeOf(object); - } + if (typeof desc.value === 'function') { + return unapply(desc.value); + } + } - function fallbackValue(element) { - console.warn('fallback value for', element); - return null; - } + object = getPrototypeOf(object); + } - return fallbackValue; + function fallbackValue(element) { + console.warn('fallback value for', element); + return null; + } + + return fallbackValue; } -var html = freeze(['a', 'abbr', 'acronym', 'address', 'area', 'article', 'aside', 'audio', 'b', 'bdi', 'bdo', 'big', 'blink', 'blockquote', 'body', 'br', 'button', 'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', 'content', 'data', 'datalist', 'dd', 'decorator', 'del', 'details', 'dfn', 'dialog', 'dir', 'div', 'dl', 'dt', 'element', 'em', 'fieldset', 'figcaption', 'figure', 'font', 'footer', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'header', 'hgroup', 'hr', 'html', 'i', 'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'main', 'map', 'mark', 'marquee', 'menu', 'menuitem', 'meter', 'nav', 'nobr', 'ol', 'optgroup', 'option', 'output', 'p', 'picture', 'pre', 'progress', 'q', 'rp', 'rt', 'ruby', 's', 'samp', 'section', 'select', 'shadow', 'small', 'source', 'spacer', 'span', 'strike', 'strong', 'style', 'sub', 'summary', 'sup', 'table', 'tbody', 'td', 'template', 'textarea', 'tfoot', 'th', 'thead', 'time', 'tr', 'track', 'tt', 'u', 'ul', 'var', 'video', 'wbr']); +const html$1 = freeze(['a', 'abbr', 'acronym', 'address', 'area', 'article', 'aside', 'audio', 'b', 'bdi', 'bdo', 'big', 'blink', 'blockquote', 'body', 'br', 'button', 'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', 'content', 'data', 'datalist', 'dd', 'decorator', 'del', 'details', 'dfn', 'dialog', 'dir', 'div', 'dl', 'dt', 'element', 'em', 'fieldset', 'figcaption', 'figure', 'font', 'footer', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'header', 'hgroup', 'hr', 'html', 'i', 'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'main', 'map', 'mark', 'marquee', 'menu', 'menuitem', 'meter', 'nav', 'nobr', 'ol', 'optgroup', 'option', 'output', 'p', 'picture', 'pre', 'progress', 'q', 'rp', 'rt', 'ruby', 's', 'samp', 'section', 'select', 'shadow', 'small', 'source', 'spacer', 'span', 'strike', 'strong', 'style', 'sub', 'summary', 'sup', 'table', 'tbody', 'td', 'template', 'textarea', 'tfoot', 'th', 'thead', 'time', 'tr', 'track', 'tt', 'u', 'ul', 'var', 'video', 'wbr']); // SVG -// SVG -var svg = freeze(['svg', 'a', 'altglyph', 'altglyphdef', 'altglyphitem', 'animatecolor', 'animatemotion', 'animatetransform', 'circle', 'clippath', 'defs', 'desc', 'ellipse', 'filter', 'font', 'g', 'glyph', 'glyphref', 'hkern', 'image', 'line', 'lineargradient', 'marker', 'mask', 'metadata', 'mpath', 'path', 'pattern', 'polygon', 'polyline', 'radialgradient', 'rect', 'stop', 'style', 'switch', 'symbol', 'text', 'textpath', 'title', 'tref', 'tspan', 'view', 'vkern']); - -var svgFilters = freeze(['feBlend', 'feColorMatrix', 'feComponentTransfer', 'feComposite', 'feConvolveMatrix', 'feDiffuseLighting', 'feDisplacementMap', 'feDistantLight', 'feFlood', 'feFuncA', 'feFuncB', 'feFuncG', 'feFuncR', 'feGaussianBlur', 'feMerge', 'feMergeNode', 'feMorphology', 'feOffset', 'fePointLight', 'feSpecularLighting', 'feSpotLight', 'feTile', 'feTurbulence']); - -// List of SVG elements that are disallowed by default. +const svg$1 = freeze(['svg', 'a', 'altglyph', 'altglyphdef', 'altglyphitem', 'animatecolor', 'animatemotion', 'animatetransform', 'circle', 'clippath', 'defs', 'desc', 'ellipse', 'filter', 'font', 'g', 'glyph', 'glyphref', 'hkern', 'image', 'line', 'lineargradient', 'marker', 'mask', 'metadata', 'mpath', 'path', 'pattern', 'polygon', 'polyline', 'radialgradient', 'rect', 'stop', 'style', 'switch', 'symbol', 'text', 'textpath', 'title', 'tref', 'tspan', 'view', 'vkern']); +const svgFilters = freeze(['feBlend', 'feColorMatrix', 'feComponentTransfer', 'feComposite', 'feConvolveMatrix', 'feDiffuseLighting', 'feDisplacementMap', 'feDistantLight', 'feDropShadow', 'feFlood', 'feFuncA', 'feFuncB', 'feFuncG', 'feFuncR', 'feGaussianBlur', 'feImage', 'feMerge', 'feMergeNode', 'feMorphology', 'feOffset', 'fePointLight', 'feSpecularLighting', 'feSpotLight', 'feTile', 'feTurbulence']); // List of SVG elements that are disallowed by default. // We still need to know them so that we can do namespace // checks properly in case one wants to add them to // allow-list. -var svgDisallowed = freeze(['animate', 'color-profile', 'cursor', 'discard', 'fedropshadow', 'feimage', 'font-face', 'font-face-format', 'font-face-name', 'font-face-src', 'font-face-uri', 'foreignobject', 'hatch', 'hatchpath', 'mesh', 'meshgradient', 'meshpatch', 'meshrow', 'missing-glyph', 'script', 'set', 'solidcolor', 'unknown', 'use']); -var mathMl = freeze(['math', 'menclose', 'merror', 'mfenced', 'mfrac', 'mglyph', 'mi', 'mlabeledtr', 'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded', 'mphantom', 'mroot', 'mrow', 'ms', 'mspace', 'msqrt', 'mstyle', 'msub', 'msup', 'msubsup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder', 'munderover']); - -// Similarly to SVG, we want to know all MathML elements, +const svgDisallowed = freeze(['animate', 'color-profile', 'cursor', 'discard', 'font-face', 'font-face-format', 'font-face-name', 'font-face-src', 'font-face-uri', 'foreignobject', 'hatch', 'hatchpath', 'mesh', 'meshgradient', 'meshpatch', 'meshrow', 'missing-glyph', 'script', 'set', 'solidcolor', 'unknown', 'use']); +const mathMl$1 = freeze(['math', 'menclose', 'merror', 'mfenced', 'mfrac', 'mglyph', 'mi', 'mlabeledtr', 'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded', 'mphantom', 'mroot', 'mrow', 'ms', 'mspace', 'msqrt', 'mstyle', 'msub', 'msup', 'msubsup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder', 'munderover', 'mprescripts']); // Similarly to SVG, we want to know all MathML elements, // even those that we disallow by default. -var mathMlDisallowed = freeze(['maction', 'maligngroup', 'malignmark', 'mlongdiv', 'mscarries', 'mscarry', 'msgroup', 'mstack', 'msline', 'msrow', 'semantics', 'annotation', 'annotation-xml', 'mprescripts', 'none']); -var text = freeze(['#text']); +const mathMlDisallowed = freeze(['maction', 'maligngroup', 'malignmark', 'mlongdiv', 'mscarries', 'mscarry', 'msgroup', 'mstack', 'msline', 'msrow', 'semantics', 'annotation', 'annotation-xml', 'mprescripts', 'none']); +const text = freeze(['#text']); -var html$1 = freeze(['accept', 'action', 'align', 'alt', 'autocapitalize', 'autocomplete', 'autopictureinpicture', 'autoplay', 'background', 'bgcolor', 'border', 'capture', 'cellpadding', 'cellspacing', 'checked', 'cite', 'class', 'clear', 'color', 'cols', 'colspan', 'controls', 'controlslist', 'coords', 'crossorigin', 'datetime', 'decoding', 'default', 'dir', 'disabled', 'disablepictureinpicture', 'disableremoteplayback', 'download', 'draggable', 'enctype', 'enterkeyhint', 'face', 'for', 'headers', 'height', 'hidden', 'high', 'href', 'hreflang', 'id', 'inputmode', 'integrity', 'ismap', 'kind', 'label', 'lang', 'list', 'loading', 'loop', 'low', 'max', 'maxlength', 'media', 'method', 'min', 'minlength', 'multiple', 'muted', 'name', 'noshade', 'novalidate', 'nowrap', 'open', 'optimum', 'pattern', 'placeholder', 'playsinline', 'poster', 'preload', 'pubdate', 'radiogroup', 'readonly', 'rel', 'required', 'rev', 'reversed', 'role', 'rows', 'rowspan', 'spellcheck', 'scope', 'selected', 'shape', 'size', 'sizes', 'span', 'srclang', 'start', 'src', 'srcset', 'step', 'style', 'summary', 'tabindex', 'title', 'translate', 'type', 'usemap', 'valign', 'value', 'width', 'xmlns', 'slot']); +const html = freeze(['accept', 'action', 'align', 'alt', 'autocapitalize', 'autocomplete', 'autopictureinpicture', 'autoplay', 'background', 'bgcolor', 'border', 'capture', 'cellpadding', 'cellspacing', 'checked', 'cite', 'class', 'clear', 'color', 'cols', 'colspan', 'controls', 'controlslist', 'coords', 'crossorigin', 'datetime', 'decoding', 'default', 'dir', 'disabled', 'disablepictureinpicture', 'disableremoteplayback', 'download', 'draggable', 'enctype', 'enterkeyhint', 'face', 'for', 'headers', 'height', 'hidden', 'high', 'href', 'hreflang', 'id', 'inputmode', 'integrity', 'ismap', 'kind', 'label', 'lang', 'list', 'loading', 'loop', 'low', 'max', 'maxlength', 'media', 'method', 'min', 'minlength', 'multiple', 'muted', 'name', 'nonce', 'noshade', 'novalidate', 'nowrap', 'open', 'optimum', 'pattern', 'placeholder', 'playsinline', 'poster', 'preload', 'pubdate', 'radiogroup', 'readonly', 'rel', 'required', 'rev', 'reversed', 'role', 'rows', 'rowspan', 'spellcheck', 'scope', 'selected', 'shape', 'size', 'sizes', 'span', 'srclang', 'start', 'src', 'srcset', 'step', 'style', 'summary', 'tabindex', 'title', 'translate', 'type', 'usemap', 'valign', 'value', 'width', 'xmlns', 'slot']); +const svg = freeze(['accent-height', 'accumulate', 'additive', 'alignment-baseline', 'ascent', 'attributename', 'attributetype', 'azimuth', 'basefrequency', 'baseline-shift', 'begin', 'bias', 'by', 'class', 'clip', 'clippathunits', 'clip-path', 'clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cx', 'cy', 'd', 'dx', 'dy', 'diffuseconstant', 'direction', 'display', 'divisor', 'dur', 'edgemode', 'elevation', 'end', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'filterunits', 'flood-color', 'flood-opacity', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'fx', 'fy', 'g1', 'g2', 'glyph-name', 'glyphref', 'gradientunits', 'gradienttransform', 'height', 'href', 'id', 'image-rendering', 'in', 'in2', 'k', 'k1', 'k2', 'k3', 'k4', 'kerning', 'keypoints', 'keysplines', 'keytimes', 'lang', 'lengthadjust', 'letter-spacing', 'kernelmatrix', 'kernelunitlength', 'lighting-color', 'local', 'marker-end', 'marker-mid', 'marker-start', 'markerheight', 'markerunits', 'markerwidth', 'maskcontentunits', 'maskunits', 'max', 'mask', 'media', 'method', 'mode', 'min', 'name', 'numoctaves', 'offset', 'operator', 'opacity', 'order', 'orient', 'orientation', 'origin', 'overflow', 'paint-order', 'path', 'pathlength', 'patterncontentunits', 'patterntransform', 'patternunits', 'points', 'preservealpha', 'preserveaspectratio', 'primitiveunits', 'r', 'rx', 'ry', 'radius', 'refx', 'refy', 'repeatcount', 'repeatdur', 'restart', 'result', 'rotate', 'scale', 'seed', 'shape-rendering', 'specularconstant', 'specularexponent', 'spreadmethod', 'startoffset', 'stddeviation', 'stitchtiles', 'stop-color', 'stop-opacity', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke', 'stroke-width', 'style', 'surfacescale', 'systemlanguage', 'tabindex', 'targetx', 'targety', 'transform', 'transform-origin', 'text-anchor', 'text-decoration', 'text-rendering', 'textlength', 'type', 'u1', 'u2', 'unicode', 'values', 'viewbox', 'visibility', 'version', 'vert-adv-y', 'vert-origin-x', 'vert-origin-y', 'width', 'word-spacing', 'wrap', 'writing-mode', 'xchannelselector', 'ychannelselector', 'x', 'x1', 'x2', 'xmlns', 'y', 'y1', 'y2', 'z', 'zoomandpan']); +const mathMl = freeze(['accent', 'accentunder', 'align', 'bevelled', 'close', 'columnsalign', 'columnlines', 'columnspan', 'denomalign', 'depth', 'dir', 'display', 'displaystyle', 'encoding', 'fence', 'frame', 'height', 'href', 'id', 'largeop', 'length', 'linethickness', 'lspace', 'lquote', 'mathbackground', 'mathcolor', 'mathsize', 'mathvariant', 'maxsize', 'minsize', 'movablelimits', 'notation', 'numalign', 'open', 'rowalign', 'rowlines', 'rowspacing', 'rowspan', 'rspace', 'rquote', 'scriptlevel', 'scriptminsize', 'scriptsizemultiplier', 'selection', 'separator', 'separators', 'stretchy', 'subscriptshift', 'supscriptshift', 'symmetric', 'voffset', 'width', 'xmlns']); +const xml = freeze(['xlink:href', 'xml:id', 'xlink:title', 'xml:space', 'xmlns:xlink']); -var svg$1 = freeze(['accent-height', 'accumulate', 'additive', 'alignment-baseline', 'ascent', 'attributename', 'attributetype', 'azimuth', 'basefrequency', 'baseline-shift', 'begin', 'bias', 'by', 'class', 'clip', 'clippathunits', 'clip-path', 'clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cx', 'cy', 'd', 'dx', 'dy', 'diffuseconstant', 'direction', 'display', 'divisor', 'dur', 'edgemode', 'elevation', 'end', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'filterunits', 'flood-color', 'flood-opacity', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'fx', 'fy', 'g1', 'g2', 'glyph-name', 'glyphref', 'gradientunits', 'gradienttransform', 'height', 'href', 'id', 'image-rendering', 'in', 'in2', 'k', 'k1', 'k2', 'k3', 'k4', 'kerning', 'keypoints', 'keysplines', 'keytimes', 'lang', 'lengthadjust', 'letter-spacing', 'kernelmatrix', 'kernelunitlength', 'lighting-color', 'local', 'marker-end', 'marker-mid', 'marker-start', 'markerheight', 'markerunits', 'markerwidth', 'maskcontentunits', 'maskunits', 'max', 'mask', 'media', 'method', 'mode', 'min', 'name', 'numoctaves', 'offset', 'operator', 'opacity', 'order', 'orient', 'orientation', 'origin', 'overflow', 'paint-order', 'path', 'pathlength', 'patterncontentunits', 'patterntransform', 'patternunits', 'points', 'preservealpha', 'preserveaspectratio', 'primitiveunits', 'r', 'rx', 'ry', 'radius', 'refx', 'refy', 'repeatcount', 'repeatdur', 'restart', 'result', 'rotate', 'scale', 'seed', 'shape-rendering', 'specularconstant', 'specularexponent', 'spreadmethod', 'startoffset', 'stddeviation', 'stitchtiles', 'stop-color', 'stop-opacity', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke', 'stroke-width', 'style', 'surfacescale', 'systemlanguage', 'tabindex', 'targetx', 'targety', 'transform', 'text-anchor', 'text-decoration', 'text-rendering', 'textlength', 'type', 'u1', 'u2', 'unicode', 'values', 'viewbox', 'visibility', 'version', 'vert-adv-y', 'vert-origin-x', 'vert-origin-y', 'width', 'word-spacing', 'wrap', 'writing-mode', 'xchannelselector', 'ychannelselector', 'x', 'x1', 'x2', 'xmlns', 'y', 'y1', 'y2', 'z', 'zoomandpan']); +const MUSTACHE_EXPR = seal(/\{\{[\w\W]*|[\w\W]*\}\}/gm); // Specify template detection regex for SAFE_FOR_TEMPLATES mode -var mathMl$1 = freeze(['accent', 'accentunder', 'align', 'bevelled', 'close', 'columnsalign', 'columnlines', 'columnspan', 'denomalign', 'depth', 'dir', 'display', 'displaystyle', 'encoding', 'fence', 'frame', 'height', 'href', 'id', 'largeop', 'length', 'linethickness', 'lspace', 'lquote', 'mathbackground', 'mathcolor', 'mathsize', 'mathvariant', 'maxsize', 'minsize', 'movablelimits', 'notation', 'numalign', 'open', 'rowalign', 'rowlines', 'rowspacing', 'rowspan', 'rspace', 'rquote', 'scriptlevel', 'scriptminsize', 'scriptsizemultiplier', 'selection', 'separator', 'separators', 'stretchy', 'subscriptshift', 'supscriptshift', 'symmetric', 'voffset', 'width', 'xmlns']); +const ERB_EXPR = seal(/<%[\w\W]*|[\w\W]*%>/gm); +const TMPLIT_EXPR = seal(/\${[\w\W]*}/gm); +const DATA_ATTR = seal(/^data-[\-\w.\u00B7-\uFFFF]/); // eslint-disable-line no-useless-escape -var xml = freeze(['xlink:href', 'xml:id', 'xlink:title', 'xml:space', 'xmlns:xlink']); +const ARIA_ATTR = seal(/^aria-[\-\w]+$/); // eslint-disable-line no-useless-escape -// eslint-disable-next-line unicorn/better-regex -var MUSTACHE_EXPR = seal(/\{\{[\s\S]*|[\s\S]*\}\}/gm); // Specify template detection regex for SAFE_FOR_TEMPLATES mode -var ERB_EXPR = seal(/<%[\s\S]*|[\s\S]*%>/gm); -var DATA_ATTR = seal(/^data-[\-\w.\u00B7-\uFFFF]/); // eslint-disable-line no-useless-escape -var ARIA_ATTR = seal(/^aria-[\-\w]+$/); // eslint-disable-line no-useless-escape -var IS_ALLOWED_URI = seal(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i // eslint-disable-line no-useless-escape +const IS_ALLOWED_URI = seal(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i // eslint-disable-line no-useless-escape ); -var IS_SCRIPT_OR_DATA = seal(/^(?:\w+script|data):/i); -var ATTR_WHITESPACE = seal(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g // eslint-disable-line no-control-regex +const IS_SCRIPT_OR_DATA = seal(/^(?:\w+script|data):/i); +const ATTR_WHITESPACE = seal(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g // eslint-disable-line no-control-regex ); +const DOCTYPE_NAME = seal(/^html$/i); -var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; - -function _toConsumableArray$1(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } } - -var getGlobal = function getGlobal() { - return typeof window === 'undefined' ? null : window; -}; +var EXPRESSIONS = /*#__PURE__*/Object.freeze({ + __proto__: null, + MUSTACHE_EXPR: MUSTACHE_EXPR, + ERB_EXPR: ERB_EXPR, + TMPLIT_EXPR: TMPLIT_EXPR, + DATA_ATTR: DATA_ATTR, + ARIA_ATTR: ARIA_ATTR, + IS_ALLOWED_URI: IS_ALLOWED_URI, + IS_SCRIPT_OR_DATA: IS_SCRIPT_OR_DATA, + ATTR_WHITESPACE: ATTR_WHITESPACE, + DOCTYPE_NAME: DOCTYPE_NAME +}); +const getGlobal = () => typeof window === 'undefined' ? null : window; /** * Creates a no-op policy for internal use only. * Don't export this function outside this module! * @param {?TrustedTypePolicyFactory} trustedTypes The policy factory. - * @param {Document} document The document object (to determine policy name suffix) + * @param {HTMLScriptElement} purifyHostElement The Script element used to load DOMPurify (to determine policy name suffix). * @return {?TrustedTypePolicy} The policy created (or null, if Trusted Types - * are not supported). + * are not supported or creating the policy failed). */ -var _createTrustedTypesPolicy = function _createTrustedTypesPolicy(trustedTypes, document) { - if ((typeof trustedTypes === 'undefined' ? 'undefined' : _typeof(trustedTypes)) !== 'object' || typeof trustedTypes.createPolicy !== 'function') { - return null; - } - // Allow the callers to control the unique policy name - // by adding a data-tt-policy-suffix to the script element with the DOMPurify. - // Policy creation with duplicate names throws in Trusted Types. - var suffix = null; - var ATTR_NAME = 'data-tt-policy-suffix'; - if (document.currentScript && document.currentScript.hasAttribute(ATTR_NAME)) { - suffix = document.currentScript.getAttribute(ATTR_NAME); - } - var policyName = 'dompurify' + (suffix ? '#' + suffix : ''); +const _createTrustedTypesPolicy = function _createTrustedTypesPolicy(trustedTypes, purifyHostElement) { + if (typeof trustedTypes !== 'object' || typeof trustedTypes.createPolicy !== 'function') { + return null; + } // Allow the callers to control the unique policy name + // by adding a data-tt-policy-suffix to the script element with the DOMPurify. + // Policy creation with duplicate names throws in Trusted Types. - try { - return trustedTypes.createPolicy(policyName, { - createHTML: function createHTML(html$$1) { - return html$$1; - } - }); - } catch (_) { - // Policy creation failed (most likely another DOMPurify script has - // already run). Skip creating the policy, as this will only cause errors - // if TT are enforced. - console.warn('TrustedTypes policy ' + policyName + ' could not be created.'); - return null; - } + + let suffix = null; + const ATTR_NAME = 'data-tt-policy-suffix'; + + if (purifyHostElement && purifyHostElement.hasAttribute(ATTR_NAME)) { + suffix = purifyHostElement.getAttribute(ATTR_NAME); + } + + const policyName = 'dompurify' + (suffix ? '#' + suffix : ''); + + try { + return trustedTypes.createPolicy(policyName, { + createHTML(html) { + return html; + }, + + createScriptURL(scriptUrl) { + return scriptUrl; + } + + }); + } catch (_) { + // Policy creation failed (most likely another DOMPurify script has + // already run). Skip creating the policy, as this will only cause errors + // if TT are enforced. + console.warn('TrustedTypes policy ' + policyName + ' could not be created.'); + return null; + } }; function createDOMPurify() { - var window = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getGlobal(); - - var DOMPurify = function DOMPurify(root) { - return createDOMPurify(root); - }; - - /** - * Version label, exposed for easier checks - * if DOMPurify is up to date or not - */ - DOMPurify.version = '2.3.1'; - - /** - * Array of elements that DOMPurify removed during sanitation. - * Empty if nothing was removed. - */ - DOMPurify.removed = []; - - if (!window || !window.document || window.document.nodeType !== 9) { - // Not running in a browser, provide a factory function - // so that you can pass your own Window - DOMPurify.isSupported = false; - - return DOMPurify; - } - - var originalDocument = window.document; - - var document = window.document; - var DocumentFragment = window.DocumentFragment, - HTMLTemplateElement = window.HTMLTemplateElement, - Node = window.Node, - Element = window.Element, - NodeFilter = window.NodeFilter, - _window$NamedNodeMap = window.NamedNodeMap, - NamedNodeMap = _window$NamedNodeMap === undefined ? window.NamedNodeMap || window.MozNamedAttrMap : _window$NamedNodeMap, - Text = window.Text, - Comment = window.Comment, - DOMParser = window.DOMParser, - trustedTypes = window.trustedTypes; - - - var ElementPrototype = Element.prototype; - - var cloneNode = lookupGetter(ElementPrototype, 'cloneNode'); - var getNextSibling = lookupGetter(ElementPrototype, 'nextSibling'); - var getChildNodes = lookupGetter(ElementPrototype, 'childNodes'); - var getParentNode = lookupGetter(ElementPrototype, 'parentNode'); - - // As per issue #47, the web-components registry is inherited by a - // new document created via createHTMLDocument. As per the spec - // (http://w3c.github.io/webcomponents/spec/custom/#creating-and-passing-registries) - // a new empty registry is used when creating a template contents owner - // document, so we use that as our parent document to ensure nothing - // is inherited. - if (typeof HTMLTemplateElement === 'function') { - var template = document.createElement('template'); - if (template.content && template.content.ownerDocument) { - document = template.content.ownerDocument; - } - } - - var trustedTypesPolicy = _createTrustedTypesPolicy(trustedTypes, originalDocument); - var emptyHTML = trustedTypesPolicy && RETURN_TRUSTED_TYPE ? trustedTypesPolicy.createHTML('') : ''; - - var _document = document, - implementation = _document.implementation, - createNodeIterator = _document.createNodeIterator, - createDocumentFragment = _document.createDocumentFragment, - getElementsByTagName = _document.getElementsByTagName; - var importNode = originalDocument.importNode; - - - var documentMode = {}; - try { - documentMode = clone(document).documentMode ? document.documentMode : {}; - } catch (_) {} - - var hooks = {}; - - /** - * Expose whether this browser supports running the full DOMPurify. - */ - DOMPurify.isSupported = typeof getParentNode === 'function' && implementation && typeof implementation.createHTMLDocument !== 'undefined' && documentMode !== 9; - - var MUSTACHE_EXPR$$1 = MUSTACHE_EXPR, - ERB_EXPR$$1 = ERB_EXPR, - DATA_ATTR$$1 = DATA_ATTR, - ARIA_ATTR$$1 = ARIA_ATTR, - IS_SCRIPT_OR_DATA$$1 = IS_SCRIPT_OR_DATA, - ATTR_WHITESPACE$$1 = ATTR_WHITESPACE; - var IS_ALLOWED_URI$$1 = IS_ALLOWED_URI; - - /** - * We consider the elements and attributes below to be safe. Ideally - * don't add any new ones but feel free to remove unwanted ones. - */ - - /* allowed element names */ - - var ALLOWED_TAGS = null; - var DEFAULT_ALLOWED_TAGS = addToSet({}, [].concat(_toConsumableArray$1(html), _toConsumableArray$1(svg), _toConsumableArray$1(svgFilters), _toConsumableArray$1(mathMl), _toConsumableArray$1(text))); - - /* Allowed attribute names */ - var ALLOWED_ATTR = null; - var DEFAULT_ALLOWED_ATTR = addToSet({}, [].concat(_toConsumableArray$1(html$1), _toConsumableArray$1(svg$1), _toConsumableArray$1(mathMl$1), _toConsumableArray$1(xml))); - - /* Explicitly forbidden tags (overrides ALLOWED_TAGS/ADD_TAGS) */ - var FORBID_TAGS = null; - - /* Explicitly forbidden attributes (overrides ALLOWED_ATTR/ADD_ATTR) */ - var FORBID_ATTR = null; - - /* Decide if ARIA attributes are okay */ - var ALLOW_ARIA_ATTR = true; - - /* Decide if custom data attributes are okay */ - var ALLOW_DATA_ATTR = true; - - /* Decide if unknown protocols are okay */ - var ALLOW_UNKNOWN_PROTOCOLS = false; - - /* Output should be safe for common template engines. - * This means, DOMPurify removes data attributes, mustaches and ERB - */ - var SAFE_FOR_TEMPLATES = false; - - /* Decide if document with ... should be returned */ - var WHOLE_DOCUMENT = false; - - /* Track whether config is already set on this instance of DOMPurify. */ - var SET_CONFIG = false; - - /* Decide if all elements (e.g. style, script) must be children of - * document.body. By default, browsers might move them to document.head */ - var FORCE_BODY = false; - - /* Decide if a DOM `HTMLBodyElement` should be returned, instead of a html - * string (or a TrustedHTML object if Trusted Types are supported). - * If `WHOLE_DOCUMENT` is enabled a `HTMLHtmlElement` will be returned instead - */ - var RETURN_DOM = false; - - /* Decide if a DOM `DocumentFragment` should be returned, instead of a html - * string (or a TrustedHTML object if Trusted Types are supported) */ - var RETURN_DOM_FRAGMENT = false; - - /* If `RETURN_DOM` or `RETURN_DOM_FRAGMENT` is enabled, decide if the returned DOM - * `Node` is imported into the current `Document`. If this flag is not enabled the - * `Node` will belong (its ownerDocument) to a fresh `HTMLDocument`, created by - * DOMPurify. - * - * This defaults to `true` starting DOMPurify 2.2.0. Note that setting it to `false` - * might cause XSS from attacks hidden in closed shadowroots in case the browser - * supports Declarative Shadow: DOM https://web.dev/declarative-shadow-dom/ - */ - var RETURN_DOM_IMPORT = true; - - /* Try to return a Trusted Type object instead of a string, return a string in - * case Trusted Types are not supported */ - var RETURN_TRUSTED_TYPE = false; - - /* Output should be free from DOM clobbering attacks? */ - var SANITIZE_DOM = true; - - /* Keep element content when removing element? */ - var KEEP_CONTENT = true; - - /* If a `Node` is passed to sanitize(), then performs sanitization in-place instead - * of importing it into a new Document and returning a sanitized copy */ - var IN_PLACE = false; - - /* Allow usage of profiles like html, svg and mathMl */ - var USE_PROFILES = {}; - - /* Tags to ignore content of when KEEP_CONTENT is true */ - var FORBID_CONTENTS = null; - var DEFAULT_FORBID_CONTENTS = addToSet({}, ['annotation-xml', 'audio', 'colgroup', 'desc', 'foreignobject', 'head', 'iframe', 'math', 'mi', 'mn', 'mo', 'ms', 'mtext', 'noembed', 'noframes', 'noscript', 'plaintext', 'script', 'style', 'svg', 'template', 'thead', 'title', 'video', 'xmp']); - - /* Tags that are safe for data: URIs */ - var DATA_URI_TAGS = null; - var DEFAULT_DATA_URI_TAGS = addToSet({}, ['audio', 'video', 'img', 'source', 'image', 'track']); - - /* Attributes safe for values like "javascript:" */ - var URI_SAFE_ATTRIBUTES = null; - var DEFAULT_URI_SAFE_ATTRIBUTES = addToSet({}, ['alt', 'class', 'for', 'id', 'label', 'name', 'pattern', 'placeholder', 'role', 'summary', 'title', 'value', 'style', 'xmlns']); - - var MATHML_NAMESPACE = 'http://www.w3.org/1998/Math/MathML'; - var SVG_NAMESPACE = 'http://www.w3.org/2000/svg'; - var HTML_NAMESPACE = 'http://www.w3.org/1999/xhtml'; - /* Document namespace */ - var NAMESPACE = HTML_NAMESPACE; - var IS_EMPTY_INPUT = false; - - /* Keep a reference to config to pass to hooks */ - var CONFIG = null; - - /* Ideally, do not touch anything below this line */ - /* ______________________________________________ */ - - var formElement = document.createElement('form'); - - /** - * _parseConfig - * - * @param {Object} cfg optional config literal - */ - // eslint-disable-next-line complexity - var _parseConfig = function _parseConfig(cfg) { - if (CONFIG && CONFIG === cfg) { - return; - } - - /* Shield configuration object from tampering */ - if (!cfg || (typeof cfg === 'undefined' ? 'undefined' : _typeof(cfg)) !== 'object') { - cfg = {}; - } - - /* Shield configuration object from prototype pollution */ - cfg = clone(cfg); - - /* Set configuration parameters */ - ALLOWED_TAGS = 'ALLOWED_TAGS' in cfg ? addToSet({}, cfg.ALLOWED_TAGS) : DEFAULT_ALLOWED_TAGS; - ALLOWED_ATTR = 'ALLOWED_ATTR' in cfg ? addToSet({}, cfg.ALLOWED_ATTR) : DEFAULT_ALLOWED_ATTR; - URI_SAFE_ATTRIBUTES = 'ADD_URI_SAFE_ATTR' in cfg ? addToSet(clone(DEFAULT_URI_SAFE_ATTRIBUTES), cfg.ADD_URI_SAFE_ATTR) : DEFAULT_URI_SAFE_ATTRIBUTES; - DATA_URI_TAGS = 'ADD_DATA_URI_TAGS' in cfg ? addToSet(clone(DEFAULT_DATA_URI_TAGS), cfg.ADD_DATA_URI_TAGS) : DEFAULT_DATA_URI_TAGS; - FORBID_CONTENTS = 'FORBID_CONTENTS' in cfg ? addToSet({}, cfg.FORBID_CONTENTS) : DEFAULT_FORBID_CONTENTS; - FORBID_TAGS = 'FORBID_TAGS' in cfg ? addToSet({}, cfg.FORBID_TAGS) : {}; - FORBID_ATTR = 'FORBID_ATTR' in cfg ? addToSet({}, cfg.FORBID_ATTR) : {}; - USE_PROFILES = 'USE_PROFILES' in cfg ? cfg.USE_PROFILES : false; - ALLOW_ARIA_ATTR = cfg.ALLOW_ARIA_ATTR !== false; // Default true - ALLOW_DATA_ATTR = cfg.ALLOW_DATA_ATTR !== false; // Default true - ALLOW_UNKNOWN_PROTOCOLS = cfg.ALLOW_UNKNOWN_PROTOCOLS || false; // Default false - SAFE_FOR_TEMPLATES = cfg.SAFE_FOR_TEMPLATES || false; // Default false - WHOLE_DOCUMENT = cfg.WHOLE_DOCUMENT || false; // Default false - RETURN_DOM = cfg.RETURN_DOM || false; // Default false - RETURN_DOM_FRAGMENT = cfg.RETURN_DOM_FRAGMENT || false; // Default false - RETURN_DOM_IMPORT = cfg.RETURN_DOM_IMPORT !== false; // Default true - RETURN_TRUSTED_TYPE = cfg.RETURN_TRUSTED_TYPE || false; // Default false - FORCE_BODY = cfg.FORCE_BODY || false; // Default false - SANITIZE_DOM = cfg.SANITIZE_DOM !== false; // Default true - KEEP_CONTENT = cfg.KEEP_CONTENT !== false; // Default true - IN_PLACE = cfg.IN_PLACE || false; // Default false - IS_ALLOWED_URI$$1 = cfg.ALLOWED_URI_REGEXP || IS_ALLOWED_URI$$1; - NAMESPACE = cfg.NAMESPACE || HTML_NAMESPACE; - if (SAFE_FOR_TEMPLATES) { - ALLOW_DATA_ATTR = false; - } - - if (RETURN_DOM_FRAGMENT) { - RETURN_DOM = true; - } - - /* Parse profile info */ - if (USE_PROFILES) { - ALLOWED_TAGS = addToSet({}, [].concat(_toConsumableArray$1(text))); - ALLOWED_ATTR = []; - if (USE_PROFILES.html === true) { - addToSet(ALLOWED_TAGS, html); - addToSet(ALLOWED_ATTR, html$1); - } - - if (USE_PROFILES.svg === true) { - addToSet(ALLOWED_TAGS, svg); - addToSet(ALLOWED_ATTR, svg$1); - addToSet(ALLOWED_ATTR, xml); - } - - if (USE_PROFILES.svgFilters === true) { - addToSet(ALLOWED_TAGS, svgFilters); - addToSet(ALLOWED_ATTR, svg$1); - addToSet(ALLOWED_ATTR, xml); - } - - if (USE_PROFILES.mathMl === true) { - addToSet(ALLOWED_TAGS, mathMl); - addToSet(ALLOWED_ATTR, mathMl$1); - addToSet(ALLOWED_ATTR, xml); - } - } - - /* Merge configuration parameters */ - if (cfg.ADD_TAGS) { - if (ALLOWED_TAGS === DEFAULT_ALLOWED_TAGS) { - ALLOWED_TAGS = clone(ALLOWED_TAGS); - } - - addToSet(ALLOWED_TAGS, cfg.ADD_TAGS); - } - - if (cfg.ADD_ATTR) { - if (ALLOWED_ATTR === DEFAULT_ALLOWED_ATTR) { - ALLOWED_ATTR = clone(ALLOWED_ATTR); - } - - addToSet(ALLOWED_ATTR, cfg.ADD_ATTR); - } - - if (cfg.ADD_URI_SAFE_ATTR) { - addToSet(URI_SAFE_ATTRIBUTES, cfg.ADD_URI_SAFE_ATTR); - } - - if (cfg.FORBID_CONTENTS) { - if (FORBID_CONTENTS === DEFAULT_FORBID_CONTENTS) { - FORBID_CONTENTS = clone(FORBID_CONTENTS); - } - - addToSet(FORBID_CONTENTS, cfg.FORBID_CONTENTS); - } - - /* Add #text in case KEEP_CONTENT is set to true */ - if (KEEP_CONTENT) { - ALLOWED_TAGS['#text'] = true; - } - - /* Add html, head and body to ALLOWED_TAGS in case WHOLE_DOCUMENT is true */ - if (WHOLE_DOCUMENT) { - addToSet(ALLOWED_TAGS, ['html', 'head', 'body']); - } - - /* Add tbody to ALLOWED_TAGS in case tables are permitted, see #286, #365 */ - if (ALLOWED_TAGS.table) { - addToSet(ALLOWED_TAGS, ['tbody']); - delete FORBID_TAGS.tbody; - } - - // Prevent further manipulation of configuration. - // Not available in IE8, Safari 5, etc. - if (freeze) { - freeze(cfg); - } - - CONFIG = cfg; - }; - - var MATHML_TEXT_INTEGRATION_POINTS = addToSet({}, ['mi', 'mo', 'mn', 'ms', 'mtext']); - - var HTML_INTEGRATION_POINTS = addToSet({}, ['foreignobject', 'desc', 'title', 'annotation-xml']); - - /* Keep track of all possible SVG and MathML tags - * so that we can perform the namespace checks - * correctly. */ - var ALL_SVG_TAGS = addToSet({}, svg); - addToSet(ALL_SVG_TAGS, svgFilters); - addToSet(ALL_SVG_TAGS, svgDisallowed); - - var ALL_MATHML_TAGS = addToSet({}, mathMl); - addToSet(ALL_MATHML_TAGS, mathMlDisallowed); - - /** - * - * - * @param {Element} element a DOM element whose namespace is being checked - * @returns {boolean} Return false if the element has a - * namespace that a spec-compliant parser would never - * return. Return true otherwise. - */ - var _checkValidNamespace = function _checkValidNamespace(element) { - var parent = getParentNode(element); - - // In JSDOM, if we're inside shadow DOM, then parentNode - // can be null. We just simulate parent in this case. - if (!parent || !parent.tagName) { - parent = { - namespaceURI: HTML_NAMESPACE, - tagName: 'template' - }; - } - - var tagName = stringToLowerCase(element.tagName); - var parentTagName = stringToLowerCase(parent.tagName); - - if (element.namespaceURI === SVG_NAMESPACE) { - // The only way to switch from HTML namespace to SVG - // is via . If it happens via any other tag, then - // it should be killed. - if (parent.namespaceURI === HTML_NAMESPACE) { - return tagName === 'svg'; - } - - // The only way to switch from MathML to SVG is via - // svg if parent is either or MathML - // text integration points. - if (parent.namespaceURI === MATHML_NAMESPACE) { - return tagName === 'svg' && (parentTagName === 'annotation-xml' || MATHML_TEXT_INTEGRATION_POINTS[parentTagName]); - } - - // We only allow elements that are defined in SVG - // spec. All others are disallowed in SVG namespace. - return Boolean(ALL_SVG_TAGS[tagName]); - } - - if (element.namespaceURI === MATHML_NAMESPACE) { - // The only way to switch from HTML namespace to MathML - // is via . If it happens via any other tag, then - // it should be killed. - if (parent.namespaceURI === HTML_NAMESPACE) { - return tagName === 'math'; - } - - // The only way to switch from SVG to MathML is via - // and HTML integration points - if (parent.namespaceURI === SVG_NAMESPACE) { - return tagName === 'math' && HTML_INTEGRATION_POINTS[parentTagName]; - } - - // We only allow elements that are defined in MathML - // spec. All others are disallowed in MathML namespace. - return Boolean(ALL_MATHML_TAGS[tagName]); - } - - if (element.namespaceURI === HTML_NAMESPACE) { - // The only way to switch from SVG to HTML is via - // HTML integration points, and from MathML to HTML - // is via MathML text integration points - if (parent.namespaceURI === SVG_NAMESPACE && !HTML_INTEGRATION_POINTS[parentTagName]) { - return false; - } - - if (parent.namespaceURI === MATHML_NAMESPACE && !MATHML_TEXT_INTEGRATION_POINTS[parentTagName]) { - return false; - } - - // Certain elements are allowed in both SVG and HTML - // namespace. We need to specify them explicitly - // so that they don't get erronously deleted from - // HTML namespace. - var commonSvgAndHTMLElements = addToSet({}, ['title', 'style', 'font', 'a', 'script']); - - // We disallow tags that are specific for MathML - // or SVG and should never appear in HTML namespace - return !ALL_MATHML_TAGS[tagName] && (commonSvgAndHTMLElements[tagName] || !ALL_SVG_TAGS[tagName]); - } - - // The code should never reach this place (this means - // that the element somehow got namespace that is not - // HTML, SVG or MathML). Return false just in case. - return false; - }; - - /** - * _forceRemove - * - * @param {Node} node a DOM node - */ - var _forceRemove = function _forceRemove(node) { - arrayPush(DOMPurify.removed, { element: node }); - try { - // eslint-disable-next-line unicorn/prefer-dom-node-remove - node.parentNode.removeChild(node); - } catch (_) { - try { - node.outerHTML = emptyHTML; - } catch (_) { - node.remove(); - } - } - }; - - /** - * _removeAttribute - * - * @param {String} name an Attribute name - * @param {Node} node a DOM node - */ - var _removeAttribute = function _removeAttribute(name, node) { - try { - arrayPush(DOMPurify.removed, { - attribute: node.getAttributeNode(name), - from: node - }); - } catch (_) { - arrayPush(DOMPurify.removed, { - attribute: null, - from: node - }); - } - - node.removeAttribute(name); - - // We void attribute values for unremovable "is"" attributes - if (name === 'is' && !ALLOWED_ATTR[name]) { - if (RETURN_DOM || RETURN_DOM_FRAGMENT) { - try { - _forceRemove(node); - } catch (_) {} - } else { - try { - node.setAttribute(name, ''); - } catch (_) {} - } - } - }; - - /** - * _initDocument - * - * @param {String} dirty a string of dirty markup - * @return {Document} a DOM, filled with the dirty markup - */ - var _initDocument = function _initDocument(dirty) { - /* Create a HTML document */ - var doc = void 0; - var leadingWhitespace = void 0; - - if (FORCE_BODY) { - dirty = '' + dirty; - } else { - /* If FORCE_BODY isn't used, leading whitespace needs to be preserved manually */ - var matches = stringMatch(dirty, /^[\r\n\t ]+/); - leadingWhitespace = matches && matches[0]; - } - - var dirtyPayload = trustedTypesPolicy ? trustedTypesPolicy.createHTML(dirty) : dirty; - /* - * Use the DOMParser API by default, fallback later if needs be - * DOMParser not work for svg when has multiple root element. - */ - if (NAMESPACE === HTML_NAMESPACE) { - try { - doc = new DOMParser().parseFromString(dirtyPayload, 'text/html'); - } catch (_) {} - } - - /* Use createHTMLDocument in case DOMParser is not available */ - if (!doc || !doc.documentElement) { - doc = implementation.createDocument(NAMESPACE, 'template', null); - try { - doc.documentElement.innerHTML = IS_EMPTY_INPUT ? '' : dirtyPayload; - } catch (_) { - // Syntax error if dirtyPayload is invalid xml - } - } - - var body = doc.body || doc.documentElement; - - if (dirty && leadingWhitespace) { - body.insertBefore(document.createTextNode(leadingWhitespace), body.childNodes[0] || null); - } - - /* Work on whole document or just its body */ - if (NAMESPACE === HTML_NAMESPACE) { - return getElementsByTagName.call(doc, WHOLE_DOCUMENT ? 'html' : 'body')[0]; - } - - return WHOLE_DOCUMENT ? doc.documentElement : body; - }; - - /** - * _createIterator - * - * @param {Document} root document/fragment to create iterator for - * @return {Iterator} iterator instance - */ - var _createIterator = function _createIterator(root) { - return createNodeIterator.call(root.ownerDocument || root, root, NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_COMMENT | NodeFilter.SHOW_TEXT, null, false); - }; - - /** - * _isClobbered - * - * @param {Node} elm element to check for clobbering attacks - * @return {Boolean} true if clobbered, false if safe - */ - var _isClobbered = function _isClobbered(elm) { - if (elm instanceof Text || elm instanceof Comment) { - return false; - } - - if (typeof elm.nodeName !== 'string' || typeof elm.textContent !== 'string' || typeof elm.removeChild !== 'function' || !(elm.attributes instanceof NamedNodeMap) || typeof elm.removeAttribute !== 'function' || typeof elm.setAttribute !== 'function' || typeof elm.namespaceURI !== 'string' || typeof elm.insertBefore !== 'function') { - return true; - } - - return false; - }; - - /** - * _isNode - * - * @param {Node} obj object to check whether it's a DOM node - * @return {Boolean} true is object is a DOM node - */ - var _isNode = function _isNode(object) { - return (typeof Node === 'undefined' ? 'undefined' : _typeof(Node)) === 'object' ? object instanceof Node : object && (typeof object === 'undefined' ? 'undefined' : _typeof(object)) === 'object' && typeof object.nodeType === 'number' && typeof object.nodeName === 'string'; - }; - - /** - * _executeHook - * Execute user configurable hooks - * - * @param {String} entryPoint Name of the hook's entry point - * @param {Node} currentNode node to work on with the hook - * @param {Object} data additional hook parameters - */ - var _executeHook = function _executeHook(entryPoint, currentNode, data) { - if (!hooks[entryPoint]) { - return; - } - - arrayForEach(hooks[entryPoint], function (hook) { - hook.call(DOMPurify, currentNode, data, CONFIG); - }); - }; - - /** - * _sanitizeElements - * - * @protect nodeName - * @protect textContent - * @protect removeChild - * - * @param {Node} currentNode to check for permission to exist - * @return {Boolean} true if node was killed, false if left alive - */ - var _sanitizeElements = function _sanitizeElements(currentNode) { - var content = void 0; - - /* Execute a hook if present */ - _executeHook('beforeSanitizeElements', currentNode, null); - - /* Check if element is clobbered or can clobber */ - if (_isClobbered(currentNode)) { - _forceRemove(currentNode); - return true; - } - - /* Check if tagname contains Unicode */ - if (stringMatch(currentNode.nodeName, /[\u0080-\uFFFF]/)) { - _forceRemove(currentNode); - return true; - } - - /* Now let's check the element's type and name */ - var tagName = stringToLowerCase(currentNode.nodeName); - - /* Execute a hook if present */ - _executeHook('uponSanitizeElement', currentNode, { - tagName: tagName, - allowedTags: ALLOWED_TAGS - }); - - /* Detect mXSS attempts abusing namespace confusion */ - if (!_isNode(currentNode.firstElementChild) && (!_isNode(currentNode.content) || !_isNode(currentNode.content.firstElementChild)) && regExpTest(/<[/\w]/g, currentNode.innerHTML) && regExpTest(/<[/\w]/g, currentNode.textContent)) { - _forceRemove(currentNode); - return true; - } - - /* Mitigate a problem with templates inside select */ - if (tagName === 'select' && regExpTest(/' + dirty + ''; + } + + const dirtyPayload = trustedTypesPolicy ? trustedTypesPolicy.createHTML(dirty) : dirty; + /* + * Use the DOMParser API by default, fallback later if needs be + * DOMParser not work for svg when has multiple root element. + */ + + if (NAMESPACE === HTML_NAMESPACE) { + try { + doc = new DOMParser().parseFromString(dirtyPayload, PARSER_MEDIA_TYPE); + } catch (_) { } + } + /* Use createHTMLDocument in case DOMParser is not available */ + + + if (!doc || !doc.documentElement) { + doc = implementation.createDocument(NAMESPACE, 'template', null); + + try { + doc.documentElement.innerHTML = IS_EMPTY_INPUT ? emptyHTML : dirtyPayload; + } catch (_) {// Syntax error if dirtyPayload is invalid xml + } + } + + const body = doc.body || doc.documentElement; + + if (dirty && leadingWhitespace) { + body.insertBefore(document.createTextNode(leadingWhitespace), body.childNodes[0] || null); + } + /* Work on whole document or just its body */ + + + if (NAMESPACE === HTML_NAMESPACE) { + return getElementsByTagName.call(doc, WHOLE_DOCUMENT ? 'html' : 'body')[0]; + } + + return WHOLE_DOCUMENT ? doc.documentElement : body; + }; + /** + * _createIterator + * + * @param {Document} root document/fragment to create iterator for + * @return {Iterator} iterator instance + */ + + + const _createIterator = function _createIterator(root) { + return createNodeIterator.call(root.ownerDocument || root, root, // eslint-disable-next-line no-bitwise + NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_COMMENT | NodeFilter.SHOW_TEXT, null, false); + }; + /** + * _isClobbered + * + * @param {Node} elm element to check for clobbering attacks + * @return {Boolean} true if clobbered, false if safe + */ + + + const _isClobbered = function _isClobbered(elm) { + return elm instanceof HTMLFormElement && (typeof elm.nodeName !== 'string' || typeof elm.textContent !== 'string' || typeof elm.removeChild !== 'function' || !(elm.attributes instanceof NamedNodeMap) || typeof elm.removeAttribute !== 'function' || typeof elm.setAttribute !== 'function' || typeof elm.namespaceURI !== 'string' || typeof elm.insertBefore !== 'function' || typeof elm.hasChildNodes !== 'function'); + }; + /** + * _isNode + * + * @param {Node} obj object to check whether it's a DOM node + * @return {Boolean} true is object is a DOM node + */ + + + const _isNode = function _isNode(object) { + return typeof Node === 'object' ? object instanceof Node : object && typeof object === 'object' && typeof object.nodeType === 'number' && typeof object.nodeName === 'string'; + }; + /** + * _executeHook + * Execute user configurable hooks + * + * @param {String} entryPoint Name of the hook's entry point + * @param {Node} currentNode node to work on with the hook + * @param {Object} data additional hook parameters + */ + + + const _executeHook = function _executeHook(entryPoint, currentNode, data) { + if (!hooks[entryPoint]) { + return; + } + + arrayForEach(hooks[entryPoint], hook => { + hook.call(DOMPurify, currentNode, data, CONFIG); + }); + }; + /** + * _sanitizeElements + * + * @protect nodeName + * @protect textContent + * @protect removeChild + * + * @param {Node} currentNode to check for permission to exist + * @return {Boolean} true if node was killed, false if left alive + */ + + + const _sanitizeElements = function _sanitizeElements(currentNode) { + let content; + /* Execute a hook if present */ + + _executeHook('beforeSanitizeElements', currentNode, null); + /* Check if element is clobbered or can clobber */ + + + if (_isClobbered(currentNode)) { + _forceRemove(currentNode); + + return true; + } + /* Now let's check the element's type and name */ + + + const tagName = transformCaseFunc(currentNode.nodeName); + /* Execute a hook if present */ + + _executeHook('uponSanitizeElement', currentNode, { + tagName, + allowedTags: ALLOWED_TAGS + }); + /* Detect mXSS attempts abusing namespace confusion */ + + + if (currentNode.hasChildNodes() && !_isNode(currentNode.firstElementChild) && (!_isNode(currentNode.content) || !_isNode(currentNode.content.firstElementChild)) && regExpTest(/<[/\w]/g, currentNode.innerHTML) && regExpTest(/<[/\w]/g, currentNode.textContent)) { + _forceRemove(currentNode); + + return true; + } + /* Remove element if anything forbids its presence */ + + + if (!ALLOWED_TAGS[tagName] || FORBID_TAGS[tagName]) { + /* Check if we have a custom element to handle */ + if (!FORBID_TAGS[tagName] && _basicCustomElementTest(tagName)) { + if (CUSTOM_ELEMENT_HANDLING.tagNameCheck instanceof RegExp && regExpTest(CUSTOM_ELEMENT_HANDLING.tagNameCheck, tagName)) return false; + if (CUSTOM_ELEMENT_HANDLING.tagNameCheck instanceof Function && CUSTOM_ELEMENT_HANDLING.tagNameCheck(tagName)) return false; + } + /* Keep content except for bad-listed elements */ + + + if (KEEP_CONTENT && !FORBID_CONTENTS[tagName]) { + const parentNode = getParentNode(currentNode) || currentNode.parentNode; + const childNodes = getChildNodes(currentNode) || currentNode.childNodes; + + if (childNodes && parentNode) { + const childCount = childNodes.length; + + for (let i = childCount - 1; i >= 0; --i) { + parentNode.insertBefore(cloneNode(childNodes[i], true), getNextSibling(currentNode)); + } + } + } + + _forceRemove(currentNode); + + return true; + } + /* Check whether element has a valid namespace */ + + + if (currentNode instanceof Element && !_checkValidNamespace(currentNode)) { + _forceRemove(currentNode); + + return true; + } + /* Make sure that older browsers don't get fallback-tag mXSS */ + + + if ((tagName === 'noscript' || tagName === 'noembed' || tagName === 'noframes') && regExpTest(/<\/no(script|embed|frames)/i, currentNode.innerHTML)) { + _forceRemove(currentNode); + + return true; + } + /* Sanitize element content to be template-safe */ + + + if (SAFE_FOR_TEMPLATES && currentNode.nodeType === 3) { + /* Get the element's text content */ + content = currentNode.textContent; + content = stringReplace(content, MUSTACHE_EXPR, ' '); + content = stringReplace(content, ERB_EXPR, ' '); + content = stringReplace(content, TMPLIT_EXPR, ' '); + + if (currentNode.textContent !== content) { + arrayPush(DOMPurify.removed, { + element: currentNode.cloneNode() + }); + currentNode.textContent = content; + } + } + /* Execute a hook if present */ + + + _executeHook('afterSanitizeElements', currentNode, null); + + return false; + }; + /** + * _isValidAttribute + * + * @param {string} lcTag Lowercase tag name of containing element. + * @param {string} lcName Lowercase attribute name. + * @param {string} value Attribute value. + * @return {Boolean} Returns true if `value` is valid, otherwise false. + */ + // eslint-disable-next-line complexity + + + const _isValidAttribute = function _isValidAttribute(lcTag, lcName, value) { + /* Make sure attribute cannot clobber */ + if (SANITIZE_DOM && (lcName === 'id' || lcName === 'name') && (value in document || value in formElement)) { + return false; + } + /* Allow valid data-* attributes: At least one character after "-" + (https://html.spec.whatwg.org/multipage/dom.html#embedding-custom-non-visible-data-with-the-data-*-attributes) + XML-compatible (https://html.spec.whatwg.org/multipage/infrastructure.html#xml-compatible and http://www.w3.org/TR/xml/#d0e804) + We don't need to check the value; it's always URI safe. */ + + + if (ALLOW_DATA_ATTR && !FORBID_ATTR[lcName] && regExpTest(DATA_ATTR, lcName)); else if (ALLOW_ARIA_ATTR && regExpTest(ARIA_ATTR, lcName)); else if (!ALLOWED_ATTR[lcName] || FORBID_ATTR[lcName]) { + if ( // First condition does a very basic check if a) it's basically a valid custom element tagname AND + // b) if the tagName passes whatever the user has configured for CUSTOM_ELEMENT_HANDLING.tagNameCheck + // and c) if the attribute name passes whatever the user has configured for CUSTOM_ELEMENT_HANDLING.attributeNameCheck + _basicCustomElementTest(lcTag) && (CUSTOM_ELEMENT_HANDLING.tagNameCheck instanceof RegExp && regExpTest(CUSTOM_ELEMENT_HANDLING.tagNameCheck, lcTag) || CUSTOM_ELEMENT_HANDLING.tagNameCheck instanceof Function && CUSTOM_ELEMENT_HANDLING.tagNameCheck(lcTag)) && (CUSTOM_ELEMENT_HANDLING.attributeNameCheck instanceof RegExp && regExpTest(CUSTOM_ELEMENT_HANDLING.attributeNameCheck, lcName) || CUSTOM_ELEMENT_HANDLING.attributeNameCheck instanceof Function && CUSTOM_ELEMENT_HANDLING.attributeNameCheck(lcName)) || // Alternative, second condition checks if it's an `is`-attribute, AND + // the value passes whatever the user has configured for CUSTOM_ELEMENT_HANDLING.tagNameCheck + lcName === 'is' && CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements && (CUSTOM_ELEMENT_HANDLING.tagNameCheck instanceof RegExp && regExpTest(CUSTOM_ELEMENT_HANDLING.tagNameCheck, value) || CUSTOM_ELEMENT_HANDLING.tagNameCheck instanceof Function && CUSTOM_ELEMENT_HANDLING.tagNameCheck(value))); else { + return false; + } + /* Check value is safe. First, is attr inert? If so, is safe */ + + } else if (URI_SAFE_ATTRIBUTES[lcName]); else if (regExpTest(IS_ALLOWED_URI$1, stringReplace(value, ATTR_WHITESPACE, ''))); else if ((lcName === 'src' || lcName === 'xlink:href' || lcName === 'href') && lcTag !== 'script' && stringIndexOf(value, 'data:') === 0 && DATA_URI_TAGS[lcTag]); else if (ALLOW_UNKNOWN_PROTOCOLS && !regExpTest(IS_SCRIPT_OR_DATA, stringReplace(value, ATTR_WHITESPACE, ''))); else if (value) { + return false; + } else; + + return true; + }; + /** + * _basicCustomElementCheck + * checks if at least one dash is included in tagName, and it's not the first char + * for more sophisticated checking see https://github.com/sindresorhus/validate-element-name + * @param {string} tagName name of the tag of the node to sanitize + */ + + + const _basicCustomElementTest = function _basicCustomElementTest(tagName) { + return tagName.indexOf('-') > 0; + }; + /** + * _sanitizeAttributes + * + * @protect attributes + * @protect nodeName + * @protect removeAttribute + * @protect setAttribute + * + * @param {Node} currentNode to sanitize + */ + + + const _sanitizeAttributes = function _sanitizeAttributes(currentNode) { + let attr; + let value; + let lcName; + let l; + /* Execute a hook if present */ + + _executeHook('beforeSanitizeAttributes', currentNode, null); + + const { + attributes + } = currentNode; + /* Check if we have attributes; if not we might have a text node */ + + if (!attributes) { + return; + } + + const hookEvent = { + attrName: '', + attrValue: '', + keepAttr: true, + allowedAttributes: ALLOWED_ATTR + }; + l = attributes.length; + /* Go backwards over all attributes; safely remove bad ones */ + + while (l--) { + attr = attributes[l]; + const { + name, + namespaceURI + } = attr; + value = name === 'value' ? attr.value : stringTrim(attr.value); + lcName = transformCaseFunc(name); + /* Execute a hook if present */ + + hookEvent.attrName = lcName; + hookEvent.attrValue = value; + hookEvent.keepAttr = true; + hookEvent.forceKeepAttr = undefined; // Allows developers to see this is a property they can set + + _executeHook('uponSanitizeAttribute', currentNode, hookEvent); + + value = hookEvent.attrValue; + /* Did the hooks approve of the attribute? */ + + if (hookEvent.forceKeepAttr) { + continue; + } + /* Remove attribute */ + + + _removeAttribute(name, currentNode); + /* Did the hooks approve of the attribute? */ + + + if (!hookEvent.keepAttr) { + continue; + } + /* Work around a security issue in jQuery 3.0 */ + + + if (!ALLOW_SELF_CLOSE_IN_ATTR && regExpTest(/\/>/i, value)) { + _removeAttribute(name, currentNode); + + continue; + } + /* Sanitize attribute content to be template-safe */ + + + if (SAFE_FOR_TEMPLATES) { + value = stringReplace(value, MUSTACHE_EXPR, ' '); + value = stringReplace(value, ERB_EXPR, ' '); + value = stringReplace(value, TMPLIT_EXPR, ' '); + } + /* Is `value` valid for this attribute? */ + + + const lcTag = transformCaseFunc(currentNode.nodeName); + + if (!_isValidAttribute(lcTag, lcName, value)) { + continue; + } + /* Full DOM Clobbering protection via namespace isolation, + * Prefix id and name attributes with `user-content-` + */ + + + if (SANITIZE_NAMED_PROPS && (lcName === 'id' || lcName === 'name')) { + // Remove the attribute with this value + _removeAttribute(name, currentNode); // Prefix the value and later re-create the attribute with the sanitized value + + + value = SANITIZE_NAMED_PROPS_PREFIX + value; + } + /* Handle attributes that require Trusted Types */ + + + if (trustedTypesPolicy && typeof trustedTypes === 'object' && typeof trustedTypes.getAttributeType === 'function') { + if (namespaceURI); else { + switch (trustedTypes.getAttributeType(lcTag, lcName)) { + case 'TrustedHTML': + { + value = trustedTypesPolicy.createHTML(value); + break; + } + + case 'TrustedScriptURL': + { + value = trustedTypesPolicy.createScriptURL(value); + break; + } + } + } + } + /* Handle invalid data-* attribute set by try-catching it */ + + + try { + if (namespaceURI) { + currentNode.setAttributeNS(namespaceURI, name, value); + } else { + /* Fallback to setAttribute() for browser-unrecognized namespaces e.g. "x-schema". */ + currentNode.setAttribute(name, value); + } + + arrayPop(DOMPurify.removed); + } catch (_) { } + } + /* Execute a hook if present */ + + + _executeHook('afterSanitizeAttributes', currentNode, null); + }; + /** + * _sanitizeShadowDOM + * + * @param {DocumentFragment} fragment to iterate over recursively + */ + + + const _sanitizeShadowDOM = function _sanitizeShadowDOM(fragment) { + let shadowNode; + + const shadowIterator = _createIterator(fragment); + /* Execute a hook if present */ + + + _executeHook('beforeSanitizeShadowDOM', fragment, null); + + while (shadowNode = shadowIterator.nextNode()) { + /* Execute a hook if present */ + _executeHook('uponSanitizeShadowNode', shadowNode, null); + /* Sanitize tags and elements */ + + + if (_sanitizeElements(shadowNode)) { + continue; + } + /* Deep shadow DOM detected */ + + + if (shadowNode.content instanceof DocumentFragment) { + _sanitizeShadowDOM(shadowNode.content); + } + /* Check attributes, sanitize if necessary */ + + + _sanitizeAttributes(shadowNode); + } + /* Execute a hook if present */ + + + _executeHook('afterSanitizeShadowDOM', fragment, null); + }; + /** + * Sanitize + * Public method providing core sanitation functionality + * + * @param {String|Node} dirty string or DOM node + * @param {Object} configuration object + */ + // eslint-disable-next-line complexity + + + DOMPurify.sanitize = function (dirty) { + let cfg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + let body; + let importedNode; + let currentNode; + let returnNode; + /* Make sure we have a string to sanitize. + DO NOT return early, as this will return the wrong type if + the user has requested a DOM object rather than a string */ + + IS_EMPTY_INPUT = !dirty; + + if (IS_EMPTY_INPUT) { + dirty = ''; + } + /* Stringify, in case dirty is an object */ + + + if (typeof dirty !== 'string' && !_isNode(dirty)) { + if (typeof dirty.toString === 'function') { + dirty = dirty.toString(); + + if (typeof dirty !== 'string') { + throw typeErrorCreate('dirty is not a string, aborting'); + } + } else { + throw typeErrorCreate('toString is not a function'); + } + } + /* Return dirty HTML if DOMPurify cannot run */ + + + if (!DOMPurify.isSupported) { + return dirty; + } + /* Assign config vars */ + + + if (!SET_CONFIG) { + _parseConfig(cfg); + } + /* Clean up removed elements */ + + + DOMPurify.removed = []; + /* Check if dirty is correctly typed for IN_PLACE */ + + if (typeof dirty === 'string') { + IN_PLACE = false; + } + + if (IN_PLACE) { + /* Do some early pre-sanitization to avoid unsafe root nodes */ + if (dirty.nodeName) { + const tagName = transformCaseFunc(dirty.nodeName); + + if (!ALLOWED_TAGS[tagName] || FORBID_TAGS[tagName]) { + throw typeErrorCreate('root node is forbidden and cannot be sanitized in-place'); + } + } + } else if (dirty instanceof Node) { + /* If dirty is a DOM element, append to an empty document to avoid + elements being stripped by the parser */ + body = _initDocument(''); + importedNode = body.ownerDocument.importNode(dirty, true); + + if (importedNode.nodeType === 1 && importedNode.nodeName === 'BODY') { + /* Node is already a body, use as is */ + body = importedNode; + } else if (importedNode.nodeName === 'HTML') { + body = importedNode; + } else { + // eslint-disable-next-line unicorn/prefer-dom-node-append + body.appendChild(importedNode); + } + } else { + /* Exit directly if we have nothing to do */ + if (!RETURN_DOM && !SAFE_FOR_TEMPLATES && !WHOLE_DOCUMENT && // eslint-disable-next-line unicorn/prefer-includes + dirty.indexOf('<') === -1) { + return trustedTypesPolicy && RETURN_TRUSTED_TYPE ? trustedTypesPolicy.createHTML(dirty) : dirty; + } + /* Initialize the document to work on */ + + + body = _initDocument(dirty); + /* Check we have a DOM node from the data */ + + if (!body) { + return RETURN_DOM ? null : RETURN_TRUSTED_TYPE ? emptyHTML : ''; + } + } + /* Remove first element node (ours) if FORCE_BODY is set */ + + + if (body && FORCE_BODY) { + _forceRemove(body.firstChild); + } + /* Get node iterator */ + + + const nodeIterator = _createIterator(IN_PLACE ? dirty : body); + /* Now start iterating over the created document */ + + + while (currentNode = nodeIterator.nextNode()) { + /* Sanitize tags and elements */ + if (_sanitizeElements(currentNode)) { + continue; + } + /* Shadow DOM detected, sanitize it */ + + + if (currentNode.content instanceof DocumentFragment) { + _sanitizeShadowDOM(currentNode.content); + } + /* Check attributes, sanitize if necessary */ + + + _sanitizeAttributes(currentNode); + } + /* If we sanitized `dirty` in-place, return it. */ + + + if (IN_PLACE) { + return dirty; + } + /* Return sanitized string or DOM */ + + + if (RETURN_DOM) { + if (RETURN_DOM_FRAGMENT) { + returnNode = createDocumentFragment.call(body.ownerDocument); + + while (body.firstChild) { + // eslint-disable-next-line unicorn/prefer-dom-node-append + returnNode.appendChild(body.firstChild); + } + } else { + returnNode = body; + } + + if (ALLOWED_ATTR.shadowroot || ALLOWED_ATTR.shadowrootmode) { + /* + AdoptNode() is not used because internal state is not reset + (e.g. the past names map of a HTMLFormElement), this is safe + in theory but we would rather not risk another attack vector. + The state that is cloned by importNode() is explicitly defined + by the specs. + */ + returnNode = importNode.call(originalDocument, returnNode, true); + } + + return returnNode; + } + + let serializedHTML = WHOLE_DOCUMENT ? body.outerHTML : body.innerHTML; + /* Serialize doctype if allowed */ + + if (WHOLE_DOCUMENT && ALLOWED_TAGS['!doctype'] && body.ownerDocument && body.ownerDocument.doctype && body.ownerDocument.doctype.name && regExpTest(DOCTYPE_NAME, body.ownerDocument.doctype.name)) { + serializedHTML = '\n' + serializedHTML; + } + /* Sanitize final string template-safe */ + + + if (SAFE_FOR_TEMPLATES) { + serializedHTML = stringReplace(serializedHTML, MUSTACHE_EXPR, ' '); + serializedHTML = stringReplace(serializedHTML, ERB_EXPR, ' '); + serializedHTML = stringReplace(serializedHTML, TMPLIT_EXPR, ' '); + } + + return trustedTypesPolicy && RETURN_TRUSTED_TYPE ? trustedTypesPolicy.createHTML(serializedHTML) : serializedHTML; + }; + /** + * Public method to set the configuration once + * setConfig + * + * @param {Object} cfg configuration object + */ + + + DOMPurify.setConfig = function (cfg) { + _parseConfig(cfg); + + SET_CONFIG = true; + }; + /** + * Public method to remove the configuration + * clearConfig + * + */ + + + DOMPurify.clearConfig = function () { + CONFIG = null; + SET_CONFIG = false; + }; + /** + * Public method to check if an attribute value is valid. + * Uses last set config, if any. Otherwise, uses config defaults. + * isValidAttribute + * + * @param {string} tag Tag name of containing element. + * @param {string} attr Attribute name. + * @param {string} value Attribute value. + * @return {Boolean} Returns true if `value` is valid. Otherwise, returns false. + */ + + + DOMPurify.isValidAttribute = function (tag, attr, value) { + /* Initialize shared config vars if necessary. */ + if (!CONFIG) { + _parseConfig({}); + } + + const lcTag = transformCaseFunc(tag); + const lcName = transformCaseFunc(attr); + return _isValidAttribute(lcTag, lcName, value); + }; + /** + * AddHook + * Public method to add DOMPurify hooks + * + * @param {String} entryPoint entry point for the hook to add + * @param {Function} hookFunction function to execute + */ + + + DOMPurify.addHook = function (entryPoint, hookFunction) { + if (typeof hookFunction !== 'function') { + return; + } + + hooks[entryPoint] = hooks[entryPoint] || []; + arrayPush(hooks[entryPoint], hookFunction); + }; + /** + * RemoveHook + * Public method to remove a DOMPurify hook at a given entryPoint + * (pops it from the stack of hooks if more are present) + * + * @param {String} entryPoint entry point for the hook to remove + * @return {Function} removed(popped) hook + */ + + + DOMPurify.removeHook = function (entryPoint) { + if (hooks[entryPoint]) { + return arrayPop(hooks[entryPoint]); + } + }; + /** + * RemoveHooks + * Public method to remove all DOMPurify hooks at a given entryPoint + * + * @param {String} entryPoint entry point for the hooks to remove + */ + + + DOMPurify.removeHooks = function (entryPoint) { + if (hooks[entryPoint]) { + hooks[entryPoint] = []; + } + }; + /** + * RemoveAllHooks + * Public method to remove all DOMPurify hooks + * + */ + + + DOMPurify.removeAllHooks = function () { + hooks = {}; + }; + + return DOMPurify; } var purify = createDOMPurify(); diff --git a/src/vs/base/browser/trustedTypes.ts b/src/vs/base/browser/trustedTypes.ts new file mode 100644 index 00000000000..4503f210481 --- /dev/null +++ b/src/vs/base/browser/trustedTypes.ts @@ -0,0 +1,35 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { onUnexpectedError } from 'vs/base/common/errors'; + +export function createTrustedTypesPolicy( + policyName: string, + policyOptions?: Options, +): undefined | Pick, 'name' | Extract> { + + interface IMonacoEnvironment { + createTrustedTypesPolicy( + policyName: string, + policyOptions?: Options, + ): undefined | Pick, 'name' | Extract>; + } + const monacoEnvironment: IMonacoEnvironment | undefined = (globalThis as any).MonacoEnvironment; + + if (monacoEnvironment?.createTrustedTypesPolicy) { + try { + return monacoEnvironment.createTrustedTypesPolicy(policyName, policyOptions); + } catch (err) { + onUnexpectedError(err); + return undefined; + } + } + try { + return window.trustedTypes?.createPolicy(policyName, policyOptions); + } catch (err) { + onUnexpectedError(err); + return undefined; + } +} diff --git a/src/vs/base/browser/ui/aria/aria.ts b/src/vs/base/browser/ui/aria/aria.ts index 69e31279111..d0b5b3aab21 100644 --- a/src/vs/base/browser/ui/aria/aria.ts +++ b/src/vs/base/browser/ui/aria/aria.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from 'vs/base/browser/dom'; -import { isMacintosh } from 'vs/base/common/platform'; import 'vs/css!./aria'; // Use a max length since we are inserting the whole msg in the DOM and that can cause browsers to freeze for long messages #94233 @@ -32,7 +31,6 @@ export function setARIAContainer(parent: HTMLElement) { const createStatusContainer = () => { const element = document.createElement('div'); element.className = 'monaco-status'; - element.setAttribute('role', 'complementary'); element.setAttribute('aria-live', 'polite'); element.setAttribute('aria-atomic', 'true'); ariaContainer.appendChild(element); @@ -69,16 +67,12 @@ export function status(msg: string): void { return; } - if (isMacintosh) { - alert(msg); // VoiceOver does not seem to support status role + if (statusContainer.textContent !== msg) { + dom.clearNode(statusContainer2); + insertMessage(statusContainer, msg); } else { - if (statusContainer.textContent !== msg) { - dom.clearNode(statusContainer2); - insertMessage(statusContainer, msg); - } else { - dom.clearNode(statusContainer); - insertMessage(statusContainer2, msg); - } + dom.clearNode(statusContainer); + insertMessage(statusContainer2, msg); } } diff --git a/src/vs/base/browser/ui/button/button.css b/src/vs/base/browser/ui/button/button.css index f7297b2888a..14a189bd0fc 100644 --- a/src/vs/base/browser/ui/button/button.css +++ b/src/vs/base/browser/ui/button/button.css @@ -132,3 +132,41 @@ margin: 0 0.2em; color: inherit !important; } + +/* default color styles - based on CSS variables */ + +.monaco-button.default-colors, +.monaco-button-dropdown.default-colors > .monaco-button{ + color: var(--vscode-button-foreground); + background-color: var(--vscode-button-background); +} + +.monaco-button.default-colors:hover, +.monaco-button-dropdown.default-colors > .monaco-button:hover { + background-color: var(--vscode-button-hoverBackground); +} + +.monaco-button.default-colors.secondary, +.monaco-button-dropdown.default-colors > .monaco-button.secondary { + color: var(--vscode-button-secondaryForeground); + background-color: var(--vscode-button-secondaryBackground); +} + +.monaco-button.default-colors.secondary:hover, +.monaco-button-dropdown.default-colors > .monaco-button.secondary:hover { + background-color: var(--vscode-button-secondaryHoverBackground); +} + +.monaco-button-dropdown.default-colors .monaco-button-dropdown-separator { + background-color: var(--vscode-button-background); + border-top: 1px solid var(--vscode-button-border); + border-bottom: 1px solid var(--vscode-button-border); +} + +.monaco-button-dropdown.default-colors .monaco-button.secondary + .monaco-button-dropdown-separator { + background-color: var(--vscode-button-secondaryBackground); +} + +.monaco-button-dropdown.default-colors .monaco-button-dropdown-separator > div { + background-color: var(--vscode-button-separator); +} diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts index 182724b9474..5682eefc506 100644 --- a/src/vs/base/browser/ui/button/button.ts +++ b/src/vs/base/browser/ui/button/button.ts @@ -16,7 +16,7 @@ import { Color } from 'vs/base/common/color'; import { Event as BaseEvent, Emitter } from 'vs/base/common/event'; import { IMarkdownString, isMarkdownString, markdownStringEqual } from 'vs/base/common/htmlContent'; import { KeyCode } from 'vs/base/common/keyCodes'; -import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; +import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle'; import { ThemeIcon } from 'vs/base/common/themables'; import 'vs/css!./button'; import { localize } from 'vs/nls'; @@ -89,6 +89,7 @@ export class Button extends Disposable implements IButton { this._element.tabIndex = 0; this._element.setAttribute('role', 'button'); + this._element.classList.toggle('secondary', !!options.secondary); const background = options.secondary ? options.buttonSecondaryBackground : options.buttonBackground; const foreground = options.secondary ? options.buttonSecondaryForeground : options.buttonForeground; @@ -154,6 +155,11 @@ export class Button extends Disposable implements IButton { this._register(this.focusTracker.onDidBlur(() => { if (this.enabled) { this.updateBackground(false); } })); } + public override dispose(): void { + super.dispose(); + this._element.remove(); + } + private getContentElements(content: string): HTMLElement[] { const elements: HTMLSpanElement[] = []; for (let segment of renderLabelWithIcons(content)) { @@ -281,7 +287,7 @@ export class Button extends Disposable implements IButton { export interface IButtonWithDropdownOptions extends IButtonOptions { readonly contextMenuProvider: IContextMenuProvider; - readonly actions: IAction[]; + readonly actions: readonly IAction[]; readonly actionRunner?: IActionRunner; readonly addPrimaryActionToDropdown?: boolean; } @@ -344,6 +350,11 @@ export class ButtonWithDropdown extends Disposable implements IButton { })); } + override dispose() { + super.dispose(); + this.element.remove(); + } + set label(value: string) { this.button.label = value; this.action.label = value; @@ -433,32 +444,42 @@ export class ButtonWithDescription implements IButtonWithDescription { } } -export class ButtonBar extends Disposable { +export class ButtonBar { - private _buttons: IButton[] = []; + private readonly _buttons: IButton[] = []; + private readonly _buttonStore = new DisposableStore(); constructor(private readonly container: HTMLElement) { - super(); + + } + + dispose(): void { + this._buttonStore.dispose(); } get buttons(): IButton[] { return this._buttons; } + clear(): void { + this._buttonStore.clear(); + this._buttons.length = 0; + } + addButton(options: IButtonOptions): IButton { - const button = this._register(new Button(this.container, options)); + const button = this._buttonStore.add(new Button(this.container, options)); this.pushButton(button); return button; } addButtonWithDescription(options: IButtonOptions): IButtonWithDescription { - const button = this._register(new ButtonWithDescription(this.container, options)); + const button = this._buttonStore.add(new ButtonWithDescription(this.container, options)); this.pushButton(button); return button; } addButtonWithDropdown(options: IButtonWithDropdownOptions): IButton { - const button = this._register(new ButtonWithDropdown(this.container, options)); + const button = this._buttonStore.add(new ButtonWithDropdown(this.container, options)); this.pushButton(button); return button; } @@ -467,7 +488,7 @@ export class ButtonBar extends Disposable { this._buttons.push(button); const index = this._buttons.length - 1; - this._register(addDisposableListener(button.element, EventType.KEY_DOWN, e => { + this._buttonStore.add(addDisposableListener(button.element, EventType.KEY_DOWN, e => { const event = new StandardKeyboardEvent(e); let eventHandled = true; diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf index ea2309d11d3..b5623b0a55c 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/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts index 04931cca3f0..d2c9f9464ae 100644 --- a/src/vs/base/browser/ui/contextview/contextview.ts +++ b/src/vs/base/browser/ui/contextview/contextview.ts @@ -5,9 +5,11 @@ import { BrowserFeatures } from 'vs/base/browser/canIUse'; import * as DOM from 'vs/base/browser/dom'; +import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import * as platform from 'vs/base/common/platform'; import { Range } from 'vs/base/common/range'; +import { OmitOptional } from 'vs/base/common/types'; import 'vs/css!./contextview'; export const enum ContextViewDOMPosition { @@ -23,6 +25,12 @@ export interface IAnchor { height?: number; } +export function isAnchor(obj: unknown): obj is IAnchor | OmitOptional { + const anchor = obj as IAnchor | OmitOptional | undefined; + + return !!anchor && typeof anchor.x === 'number' && typeof anchor.y === 'number'; +} + export const enum AnchorAlignment { LEFT, RIGHT } @@ -36,7 +44,13 @@ export const enum AnchorAxisAlignment { } export interface IDelegate { - getAnchor(): HTMLElement | IAnchor; + /** + * The anchor where to position the context view. + * Use a `HTMLElement` to position the view at the element, + * a `StandardMouseEvent` to position it at the mouse position + * or an `IAnchor` to position it at a specific location. + */ + getAnchor(): HTMLElement | StandardMouseEvent | IAnchor; render(container: HTMLElement): IDisposable | null; focus?(): void; layout?(): void; @@ -271,13 +285,24 @@ export class ContextView extends Disposable { width: elementPosition.width * zoom, height: elementPosition.height * zoom }; - } else { + } else if (isAnchor(anchor)) { around = { top: anchor.y, left: anchor.x, width: anchor.width || 1, height: anchor.height || 2 }; + } else { + around = { + top: anchor.posy, + left: anchor.posx, + // We are about to position the context view where the mouse + // cursor is. To prevent the view being exactly under the mouse + // when showing and thus potentially triggering an action within, + // we treat the mouse location like a small sized block element. + width: 2, + height: 2 + }; } const viewSizeWidth = DOM.getTotalWidth(this.view); diff --git a/src/vs/base/browser/ui/dialog/dialog.ts b/src/vs/base/browser/ui/dialog/dialog.ts index d7fc96598f1..0b252ae46e9 100644 --- a/src/vs/base/browser/ui/dialog/dialog.ts +++ b/src/vs/base/browser/ui/dialog/dialog.ts @@ -172,16 +172,16 @@ export class Dialog extends Disposable { } private getIconAriaLabel(): string { - const typeLabel = nls.localize('dialogInfoMessage', 'Info'); + let typeLabel = nls.localize('dialogInfoMessage', 'Info'); switch (this.options.type) { case 'error': - nls.localize('dialogErrorMessage', 'Error'); + typeLabel = nls.localize('dialogErrorMessage', 'Error'); break; case 'warning': - nls.localize('dialogWarningMessage', 'Warning'); + typeLabel = nls.localize('dialogWarningMessage', 'Warning'); break; case 'pending': - nls.localize('dialogPendingMessage', 'In Progress'); + typeLabel = nls.localize('dialogPendingMessage', 'In Progress'); break; case 'none': case 'info': diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts index 1d445c4c97f..b10785d730e 100644 --- a/src/vs/base/browser/ui/dropdown/dropdown.ts +++ b/src/vs/base/browser/ui/dropdown/dropdown.ts @@ -158,24 +158,17 @@ export interface IDropdownMenuOptions extends IBaseDropdownOptions { readonly actionProvider?: IActionProvider; menuClassName?: string; menuAsChild?: boolean; // scope down for #99448 + readonly skipTelemetry?: boolean; } export class DropdownMenu extends BaseDropdown { - private _contextMenuProvider: IContextMenuProvider; private _menuOptions: IMenuOptions | undefined; private _actions: readonly IAction[] = []; - private actionProvider?: IActionProvider; - private menuClassName: string; - private menuAsChild?: boolean; - constructor(container: HTMLElement, options: IDropdownMenuOptions) { - super(container, options); + constructor(container: HTMLElement, private readonly _options: IDropdownMenuOptions) { + super(container, _options); - this._contextMenuProvider = options.contextMenuProvider; - this.actions = options.actions || []; - this.actionProvider = options.actionProvider; - this.menuClassName = options.menuClassName || ''; - this.menuAsChild = !!options.menuAsChild; + this.actions = _options.actions || []; } set menuOptions(options: IMenuOptions | undefined) { @@ -187,8 +180,8 @@ export class DropdownMenu extends BaseDropdown { } private get actions(): readonly IAction[] { - if (this.actionProvider) { - return this.actionProvider.getActions(); + if (this._options.actionProvider) { + return this._options.actionProvider.getActions(); } return this._actions; @@ -203,17 +196,18 @@ export class DropdownMenu extends BaseDropdown { this.element.classList.add('active'); - this._contextMenuProvider.showContextMenu({ + this._options.contextMenuProvider.showContextMenu({ getAnchor: () => this.element, getActions: () => this.actions, getActionsContext: () => this.menuOptions ? this.menuOptions.context : null, getActionViewItem: (action, options) => this.menuOptions && this.menuOptions.actionViewItemProvider ? this.menuOptions.actionViewItemProvider(action, options) : undefined, getKeyBinding: action => this.menuOptions && this.menuOptions.getKeyBinding ? this.menuOptions.getKeyBinding(action) : undefined, - getMenuClassName: () => this.menuClassName, + getMenuClassName: () => this._options.menuClassName || '', onHide: () => this.onHide(), actionRunner: this.menuOptions ? this.menuOptions.actionRunner : undefined, anchorAlignment: this.menuOptions ? this.menuOptions.anchorAlignment : AnchorAlignment.LEFT, - domForShadowRoot: this.menuAsChild ? this.element : undefined + domForShadowRoot: this._options.menuAsChild ? this.element : undefined, + skipTelemetry: this._options.skipTelemetry }); } diff --git a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts index d2deea3f7f6..20837817eb1 100644 --- a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts +++ b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts @@ -35,6 +35,7 @@ export interface IDropdownMenuActionViewItemOptions extends IBaseActionViewItemO readonly classNames?: string[] | string; readonly anchorAlignmentProvider?: IAnchorAlignmentProvider; readonly menuAsChild?: boolean; + readonly skipTelemetry?: boolean; } export class DropdownMenuActionViewItem extends BaseActionViewItem { @@ -101,7 +102,8 @@ export class DropdownMenuActionViewItem extends BaseActionViewItem { labelRenderer: labelRenderer, menuAsChild: this.options.menuAsChild, actions: isActionsArray ? this.menuActionsOrProvider as IAction[] : undefined, - actionProvider: isActionsArray ? undefined : this.menuActionsOrProvider as IActionProvider + actionProvider: isActionsArray ? undefined : this.menuActionsOrProvider as IActionProvider, + skipTelemetry: this.options.skipTelemetry }; this.dropdownMenu = this._register(new DropdownMenu(container, options)); diff --git a/src/vs/base/browser/ui/grid/grid.ts b/src/vs/base/browser/ui/grid/grid.ts index bdb6193c6a8..2562b2fa153 100644 --- a/src/vs/base/browser/ui/grid/grid.ts +++ b/src/vs/base/browser/ui/grid/grid.ts @@ -10,8 +10,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import 'vs/css!./gridview'; import { Box, GridView, IGridViewOptions, IGridViewStyles, IView as IGridViewView, IViewSize, orthogonal, Sizing as GridViewSizing } from './gridview'; import type { GridLocation } from 'vs/base/browser/ui/grid/gridview'; -///@ts-ignore -import type { SplitView } from 'vs/base/browser/ui/splitview/splitview'; +import type { SplitView, AutoSizing as SplitViewAutoSizing } from 'vs/base/browser/ui/splitview/splitview'; export { IViewSize, LayoutPriority, Orientation, orthogonal } from './gridview'; @@ -197,12 +196,14 @@ function getGridLocation(element: HTMLElement): GridLocation { export type DistributeSizing = { type: 'distribute' }; export type SplitSizing = { type: 'split' }; +export type AutoSizing = { type: 'auto' }; export type InvisibleSizing = { type: 'invisible'; cachedVisibleSize: number }; -export type Sizing = DistributeSizing | SplitSizing | InvisibleSizing; +export type Sizing = DistributeSizing | SplitSizing | AutoSizing | InvisibleSizing; export namespace Sizing { export const Distribute: DistributeSizing = { type: 'distribute' }; export const Split: SplitSizing = { type: 'split' }; + export const Auto: AutoSizing = { type: 'auto' }; export function Invisible(cachedVisibleSize: number): InvisibleSizing { return { type: 'invisible', cachedVisibleSize }; } } @@ -403,6 +404,9 @@ export class Grid extends Disposable { viewSize = GridViewSizing.Split(index); } else if (size.type === 'distribute') { viewSize = GridViewSizing.Distribute; + } else if (size.type === 'auto') { + const [, index] = tail(referenceLocation); + viewSize = GridViewSizing.Auto(index); } else { viewSize = size; } @@ -445,7 +449,17 @@ export class Grid extends Disposable { } const location = this.getViewLocation(view); - this.gridview.removeView(location, (sizing && sizing.type === 'distribute') ? GridViewSizing.Distribute : undefined); + + let gridViewSizing: DistributeSizing | SplitViewAutoSizing | undefined; + + if (sizing?.type === 'distribute') { + gridViewSizing = GridViewSizing.Distribute; + } else if (sizing?.type === 'auto') { + const index = location[location.length - 1]; + gridViewSizing = GridViewSizing.Auto(index === 0 ? 1 : index - 1); + } + + this.gridview.removeView(location, gridViewSizing); this.views.delete(view); } diff --git a/src/vs/base/browser/ui/grid/gridview.ts b/src/vs/base/browser/ui/grid/gridview.ts index a9b546ca5c7..c89c6a7a063 100644 --- a/src/vs/base/browser/ui/grid/gridview.ts +++ b/src/vs/base/browser/ui/grid/gridview.ts @@ -5,7 +5,7 @@ import { $ } from 'vs/base/browser/dom'; import { IBoundarySashes, Orientation, Sash } from 'vs/base/browser/ui/sash/sash'; -import { DistributeSizing, ISplitViewStyles, IView as ISplitView, LayoutPriority, Sizing, SplitView } from 'vs/base/browser/ui/splitview/splitview'; +import { DistributeSizing, ISplitViewStyles, IView as ISplitView, LayoutPriority, Sizing, AutoSizing, SplitView } from 'vs/base/browser/ui/splitview/splitview'; import { equals as arrayEquals, tail2 as tail } from 'vs/base/common/arrays'; import { Color } from 'vs/base/common/color'; import { Emitter, Event, Relay } from 'vs/base/common/event'; @@ -356,6 +356,13 @@ class BranchNode implements ISplitView, IDisposable { private _boundarySashes: IRelativeBoundarySashes = {}; get boundarySashes(): IRelativeBoundarySashes { return this._boundarySashes; } set boundarySashes(boundarySashes: IRelativeBoundarySashes) { + if (this._boundarySashes.start === boundarySashes.start + && this._boundarySashes.end === boundarySashes.end + && this._boundarySashes.orthogonalStart === boundarySashes.orthogonalStart + && this._boundarySashes.orthogonalEnd === boundarySashes.orthogonalEnd) { + return; + } + this._boundarySashes = boundarySashes; this.splitview.orthogonalStartSash = boundarySashes.orthogonalStart; @@ -498,67 +505,22 @@ class BranchNode implements ISplitView, IDisposable { index = validateIndex(index, this.children.length); this.splitview.addView(node, size, index, skipLayout); - this._addChild(node, index); - this.onDidChildrenChange(); - } - - private _addChild(node: Node, index: number): void { - const first = index === 0; - const last = index === this.children.length; this.children.splice(index, 0, node); - node.boundarySashes = { - start: this.boundarySashes.orthogonalStart, - end: this.boundarySashes.orthogonalEnd, - orthogonalStart: first ? this.boundarySashes.start : this.splitview.sashes[index - 1], - orthogonalEnd: last ? this.boundarySashes.end : this.splitview.sashes[index], - }; - - if (!first) { - this.children[index - 1].boundarySashes = { - ...this.children[index - 1].boundarySashes, - orthogonalEnd: this.splitview.sashes[index - 1] - }; - } - - if (!last) { - this.children[index + 1].boundarySashes = { - ...this.children[index + 1].boundarySashes, - orthogonalStart: this.splitview.sashes[index] - }; - } + this.updateBoundarySashes(); + this.onDidChildrenChange(); } removeChild(index: number, sizing?: Sizing): void { index = validateIndex(index, this.children.length); this.splitview.removeView(index, sizing); - this._removeChild(index); + this.children.splice(index, 1); + + this.updateBoundarySashes(); this.onDidChildrenChange(); } - private _removeChild(index: number): Node { - const first = index === 0; - const last = index === this.children.length - 1; - const [child] = this.children.splice(index, 1); - - if (!first) { - this.children[index - 1].boundarySashes = { - ...this.children[index - 1].boundarySashes, - orthogonalEnd: this.splitview.sashes[index - 1] - }; - } - - if (!last) { // [0,1,2,3] (2) => [0,1,3] - this.children[index].boundarySashes = { - ...this.children[index].boundarySashes, - orthogonalStart: this.splitview.sashes[Math.max(index - 1, 0)] - }; - } - - return child; - } - moveChild(from: number, to: number): void { from = validateIndex(from, this.children.length); to = validateIndex(to, this.children.length); @@ -568,14 +530,13 @@ class BranchNode implements ISplitView, IDisposable { } if (from < to) { - to--; + to -= 1; } this.splitview.moveView(from, to); + this.children.splice(to, 0, this.children.splice(from, 1)[0]); - const child = this._removeChild(from); - this._addChild(child, to); - + this.updateBoundarySashes(); this.onDidChildrenChange(); } @@ -649,6 +610,17 @@ class BranchNode implements ISplitView, IDisposable { return this.splitview.getViewCachedVisibleSize(index); } + private updateBoundarySashes(): void { + for (let i = 0; i < this.children.length; i++) { + this.children[i].boundarySashes = { + start: this.boundarySashes.orthogonalStart, + end: this.boundarySashes.orthogonalEnd, + orthogonalStart: i === 0 ? this.boundarySashes.start : this.splitview.sashes[i - 1], + orthogonalEnd: i === this.children.length - 1 ? this.boundarySashes.end : this.splitview.sashes[i], + }; + } + } + private onDidChildrenChange(): void { this.updateChildrenEvents(); this._onDidChange.fire(undefined); @@ -1227,7 +1199,7 @@ export class GridView implements IDisposable { * @param location The {@link GridLocation location} of the {@link IView view}. * @param sizing Whether to distribute other {@link IView view}'s sizes. */ - removeView(location: GridLocation, sizing?: DistributeSizing): IView { + removeView(location: GridLocation, sizing?: DistributeSizing | AutoSizing): IView { this.disposable2x2.dispose(); this.disposable2x2 = Disposable.None; diff --git a/src/vs/base/browser/ui/hover/hover.css b/src/vs/base/browser/ui/hover/hover.css index f3058d6c107..f008173e716 100644 --- a/src/vs/base/browser/ui/hover/hover.css +++ b/src/vs/base/browser/ui/hover/hover.css @@ -7,10 +7,9 @@ cursor: default; position: absolute; overflow: hidden; - z-index: 50; user-select: text; -webkit-user-select: text; - box-sizing: initial; + box-sizing: border-box; animation: fadein 100ms linear; line-height: 1.5em; } @@ -28,7 +27,7 @@ } .monaco-hover .markdown-hover > .hover-contents:not(.code-hover-contents) { - max-width: 500px; + max-width: var(--hover-maxWidth, 500px); word-wrap: break-word; } diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts index 1dcc1751ff8..af621b9047e 100644 --- a/src/vs/base/browser/ui/inputbox/inputBox.ts +++ b/src/vs/base/browser/ui/inputbox/inputBox.ts @@ -685,6 +685,19 @@ export class HistoryInputBox extends InputBox implements IHistoryNavigationWidge } } + public prependHistory(restoredHistory: string[]): void { + const newHistory = this.getHistory(); + this.clearHistory(); + + restoredHistory.forEach((item) => { + this.history.add(item); + }); + + newHistory.forEach(item => { + this.history.add(item); + }); + } + public getHistory(): string[] { return this.history.getHistory(); } diff --git a/src/vs/base/browser/ui/list/list.ts b/src/vs/base/browser/ui/list/list.ts index f776ba7ecb2..2a77409cd83 100644 --- a/src/vs/base/browser/ui/list/list.ts +++ b/src/vs/base/browser/ui/list/list.ts @@ -5,6 +5,7 @@ import { IDragAndDropData } from 'vs/base/browser/dnd'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; +import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { GestureEvent } from 'vs/base/browser/touch'; export interface IListVirtualDelegate { @@ -61,7 +62,7 @@ export interface IListContextMenuEvent { readonly browserEvent: UIEvent; readonly element: T | undefined; readonly index: number | undefined; - readonly anchor: HTMLElement | { readonly x: number; readonly y: number }; + readonly anchor: HTMLElement | IMouseEvent; } export interface IIdentityProvider { diff --git a/src/vs/base/browser/ui/list/listPaging.ts b/src/vs/base/browser/ui/list/listPaging.ts index 3701207d187..a3d2eb16cfc 100644 --- a/src/vs/base/browser/ui/list/listPaging.ts +++ b/src/vs/base/browser/ui/list/listPaging.ts @@ -108,7 +108,7 @@ export interface IPagedListOptions { readonly mouseSupport?: boolean; readonly horizontalScrolling?: boolean; readonly scrollByPage?: boolean; - readonly additionalScrollHeight?: number; + readonly paddingBottom?: number; } function fromPagedListOptions(modelProvider: () => IPagedModel, options: IPagedListOptions): IListOptions { diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts index 3d82a20c314..b73e5811121 100644 --- a/src/vs/base/browser/ui/list/listView.ts +++ b/src/vs/base/browser/ui/list/listView.ts @@ -56,12 +56,13 @@ export interface IListViewAccessibilityProvider { } export interface IListViewOptionsUpdate { - readonly additionalScrollHeight?: number; readonly smoothScrolling?: boolean; readonly horizontalScrolling?: boolean; readonly scrollByPage?: boolean; readonly mouseWheelScrollSensitivity?: number; readonly fastScrollSensitivity?: number; + readonly paddingTop?: number; + readonly paddingBottom?: number; } export interface IListViewOptions extends IListViewOptionsUpdate { @@ -219,7 +220,9 @@ export interface IListView extends ISpliceable, IDisposable { readonly scrollableElementDomNode: HTMLElement; readonly length: number; readonly contentHeight: number; + readonly contentWidth: number; readonly onDidChangeContentHeight: Event; + readonly onDidChangeContentWidth: Event; readonly renderHeight: number; readonly scrollHeight: number; readonly firstVisibleIndex: number; @@ -296,7 +299,7 @@ export class ListView implements IListView { private setRowLineHeight: boolean; private setRowHeight: boolean; private supportDynamicHeights: boolean; - private additionalScrollHeight: number; + private paddingBottom: number; private accessibilityProvider: ListViewAccessibilityProvider; private scrollWidth: number | undefined; @@ -310,8 +313,11 @@ export class ListView implements IListView { private readonly disposables: DisposableStore = new DisposableStore(); private readonly _onDidChangeContentHeight = new Emitter(); + private readonly _onDidChangeContentWidth = new Emitter(); readonly onDidChangeContentHeight: Event = Event.latch(this._onDidChangeContentHeight.event, undefined, this.disposables); + readonly onDidChangeContentWidth: Event = Event.latch(this._onDidChangeContentWidth.event, undefined, this.disposables); get contentHeight(): number { return this.rangeMap.size; } + get contentWidth(): number { return this.scrollWidth ?? 0; } get onDidScroll(): Event { return this.scrollableElement.onScroll; } get onWillScroll(): Event { return this.scrollableElement.onWillScroll; } @@ -359,7 +365,7 @@ export class ListView implements IListView { this.items = []; this.itemId = 0; - this.rangeMap = new RangeMap(); + this.rangeMap = new RangeMap(options.paddingTop ?? 0); for (const renderer of renderers) { this.renderers.set(renderer.templateId, renderer); @@ -381,7 +387,7 @@ export class ListView implements IListView { this._horizontalScrolling = options.horizontalScrolling ?? DefaultOptions.horizontalScrolling; this.domNode.classList.toggle('horizontal-scrolling', this._horizontalScrolling); - this.additionalScrollHeight = typeof options.additionalScrollHeight === 'undefined' ? 0 : options.additionalScrollHeight; + this.paddingBottom = typeof options.paddingBottom === 'undefined' ? 0 : options.paddingBottom; this.accessibilityProvider = new ListViewAccessibilityProvider(options.accessibilityProvider); @@ -436,8 +442,8 @@ export class ListView implements IListView { } updateOptions(options: IListViewOptionsUpdate) { - if (options.additionalScrollHeight !== undefined) { - this.additionalScrollHeight = options.additionalScrollHeight; + if (options.paddingBottom !== undefined) { + this.paddingBottom = options.paddingBottom; this.scrollableElement.setScrollDimensions({ scrollHeight: this.scrollHeight }); } @@ -466,6 +472,22 @@ export class ListView implements IListView { if (scrollableOptions) { this.scrollableElement.updateOptions(scrollableOptions); } + + if (options.paddingTop !== undefined && options.paddingTop !== this.rangeMap.paddingTop) { + // trigger a rerender + const lastRenderRange = this.getRenderRange(this.lastRenderTop, this.lastRenderHeight); + const offset = options.paddingTop - this.rangeMap.paddingTop; + this.rangeMap.paddingTop = options.paddingTop; + + this.render(lastRenderRange, Math.max(0, this.lastRenderTop + offset), this.lastRenderHeight, undefined, undefined, true); + this.setScrollTop(this.lastRenderTop); + + this.eventuallyUpdateScrollDimensions(); + + if (this.supportDynamicHeights) { + this._rerender(this.lastRenderTop, this.lastRenderHeight); + } + } } delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) { @@ -597,7 +619,7 @@ export class ListView implements IListView { // TODO@joao: improve this optimization to catch even more cases if (start === 0 && deleteCount >= this.items.length) { - this.rangeMap = new RangeMap(); + this.rangeMap = new RangeMap(this.rangeMap.paddingTop); this.rangeMap.splice(0, 0, inserted); deleted = this.items; this.items = inserted; @@ -689,6 +711,7 @@ export class ListView implements IListView { this.scrollWidth = scrollWidth; this.scrollableElement.setScrollDimensions({ scrollWidth: scrollWidth === 0 ? 0 : (scrollWidth + 10) }); + this._onDidChangeContentWidth.fire(this.scrollWidth); } updateWidth(index: number): void { @@ -702,6 +725,7 @@ export class ListView implements IListView { if (typeof item.width !== 'undefined' && item.width > this.scrollWidth) { this.scrollWidth = item.width; this.scrollableElement.setScrollDimensions({ scrollWidth: this.scrollWidth + 10 }); + this._onDidChangeContentWidth.fire(this.scrollWidth); } } @@ -1010,7 +1034,7 @@ export class ListView implements IListView { } get scrollHeight(): number { - return this._scrollHeight + (this.horizontalScrolling ? 10 : 0) + this.additionalScrollHeight; + return this._scrollHeight + (this.horizontalScrolling ? 10 : 0) + this.paddingBottom; } // Events diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index f4cfe246265..36c5a74a948 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -27,6 +27,7 @@ import { isNumber } from 'vs/base/common/types'; import 'vs/css!./list'; import { IIdentityProvider, IKeyboardNavigationDelegate, IKeyboardNavigationLabelProvider, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, IListEvent, IListGestureEvent, IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate, ListError } from './list'; import { IListView, IListViewAccessibilityProvider, IListViewDragAndDrop, IListViewOptions, IListViewOptionsUpdate, ListView } from './listView'; +import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; interface ITraitChangeEvent { indexes: number[]; @@ -129,11 +130,22 @@ class Trait implements ISpliceable, IDisposable { const diff = elements.length - deleteCount; const end = start + deleteCount; - const sortedIndexes = [ - ...this.sortedIndexes.filter(i => i < start), - ...elements.map((hasTrait, i) => hasTrait ? i + start : -1).filter(i => i !== -1), - ...this.sortedIndexes.filter(i => i >= end).map(i => i + diff) - ]; + const sortedIndexes: number[] = []; + let i = 0; + + while (i < this.sortedIndexes.length && this.sortedIndexes[i] < start) { + sortedIndexes.push(this.sortedIndexes[i++]); + } + + for (let j = 0; j < elements.length; j++) { + if (elements[j]) { + sortedIndexes.push(j + start); + } + } + + while (i < this.sortedIndexes.length && this.sortedIndexes[i] >= end) { + sortedIndexes.push(this.sortedIndexes[i++] + diff); + } const length = this.length + diff; @@ -226,12 +238,16 @@ class TraitSpliceable implements ISpliceable { splice(start: number, deleteCount: number, elements: T[]): void { if (!this.identityProvider) { - return this.trait.splice(start, deleteCount, elements.map(() => false)); + return this.trait.splice(start, deleteCount, new Array(elements.length).fill(false)); } const pastElementsWithTrait = this.trait.get().map(i => this.identityProvider!.getId(this.view.element(i)).toString()); - const elementsWithTrait = elements.map(e => pastElementsWithTrait.indexOf(this.identityProvider!.getId(e).toString()) > -1); + if (pastElementsWithTrait.length === 0) { + return this.trait.splice(start, deleteCount, new Array(elements.length).fill(false)); + } + const pastElementsWithTraitSet = new Set(pastElementsWithTrait); + const elementsWithTrait = elements.map(e => pastElementsWithTraitSet.has(this.identityProvider!.getId(e).toString())); this.trait.splice(start, deleteCount, elementsWithTrait); } } @@ -976,12 +992,13 @@ export interface IListOptions extends IListOptionsUpdate { readonly mouseSupport?: boolean; readonly horizontalScrolling?: boolean; readonly scrollByPage?: boolean; - readonly additionalScrollHeight?: number; readonly transformOptimization?: boolean; readonly smoothScrolling?: boolean; readonly scrollableElementChangeOptions?: ScrollableElementChangeOptions; readonly alwaysConsumeMouseWheel?: boolean; readonly initialSize?: Dimension; + readonly paddingTop?: number; + readonly paddingBottom?: number; } export interface IListStyles { @@ -1338,7 +1355,7 @@ export class List implements ISpliceable, IDisposable { const fromMouse = this.disposables.add(Event.chain(this.view.onContextMenu)) .filter(_ => !didJustPressContextMenuKey) - .map(({ element, index, browserEvent }) => ({ element, index, anchor: { x: browserEvent.pageX + 1, y: browserEvent.pageY }, browserEvent })) + .map(({ element, index, browserEvent }) => ({ element, index, anchor: new StandardMouseEvent(browserEvent), browserEvent })) .event; return Event.any>(fromKeyDown, fromKeyUp, fromMouse); @@ -1506,10 +1523,18 @@ export class List implements ISpliceable, IDisposable { return this.view.contentHeight; } + get contentWidth(): number { + return this.view.contentWidth; + } + get onDidChangeContentHeight(): Event { return this.view.onDidChangeContentHeight; } + get onDidChangeContentWidth(): Event { + return this.view.onDidChangeContentWidth; + } + get scrollTop(): number { return this.view.getScrollTop(); } diff --git a/src/vs/base/browser/ui/list/rangeMap.ts b/src/vs/base/browser/ui/list/rangeMap.ts index 5656a3b32de..91f435cd822 100644 --- a/src/vs/base/browser/ui/list/rangeMap.ts +++ b/src/vs/base/browser/ui/list/rangeMap.ts @@ -91,6 +91,21 @@ export class RangeMap { private groups: IRangedGroup[] = []; private _size = 0; + private _paddingTop = 0; + + get paddingTop() { + return this._paddingTop; + } + + set paddingTop(paddingTop: number) { + this._size = this._size + paddingTop - this._paddingTop; + this._paddingTop = paddingTop; + } + + constructor(topPadding?: number) { + this._paddingTop = topPadding ?? 0; + this._size = this._paddingTop; + } splice(index: number, deleteCount: number, items: IItem[] = []): void { const diff = items.length - deleteCount; @@ -104,7 +119,7 @@ export class RangeMap { })); this.groups = concat(before, middle, after); - this._size = this.groups.reduce((t, g) => t + (g.size * (g.range.end - g.range.start)), 0); + this._size = this._paddingTop + this.groups.reduce((t, g) => t + (g.size * (g.range.end - g.range.start)), 0); } /** @@ -135,8 +150,12 @@ export class RangeMap { return -1; } + if (position < this._paddingTop) { + return 0; + } + let index = 0; - let size = 0; + let size = this._paddingTop; for (const group of this.groups) { const count = group.range.end - group.range.start; @@ -177,7 +196,7 @@ export class RangeMap { const newCount = count + groupCount; if (index < newCount) { - return position + ((index - count) * group.size); + return this._paddingTop + position + ((index - count) * group.size); } position += groupCount * group.size; diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts index 697a5102b7c..9f09c7565e4 100644 --- a/src/vs/base/browser/ui/menu/menu.ts +++ b/src/vs/base/browser/ui/menu/menu.ts @@ -1288,7 +1288,7 @@ ${formatRule(Codicon.menuSubmenu)} padding: 0 1.8em; } -.linux .monaco-menu .monaco-action-bar.vertical .submenu-indicator { +.linux .monaco-menu .monaco-action-bar.vertical .submenu-indicator, :host-context(.linux) .monaco-menu .monaco-action-bar.vertical .submenu-indicator { height: 100%; mask-size: 10px 10px; diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts index b20c2185169..b82b4508211 100644 --- a/src/vs/base/browser/ui/sash/sash.ts +++ b/src/vs/base/browser/ui/sash/sash.ts @@ -328,6 +328,10 @@ export class Sash extends Disposable { * The start of a vertical sash is its top-most position. */ set orthogonalStartSash(sash: Sash | undefined) { + if (this._orthogonalStartSash === sash) { + return; + } + this.orthogonalStartDragHandleDisposables.clear(); this.orthogonalStartSashDisposables.clear(); @@ -362,6 +366,10 @@ export class Sash extends Disposable { */ set orthogonalEndSash(sash: Sash | undefined) { + if (this._orthogonalEndSash === sash) { + return; + } + this.orthogonalEndDragHandleDisposables.clear(); this.orthogonalEndSashDisposables.clear(); diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts index 87d4ed4d9fa..45a3b751e41 100644 --- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts +++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts @@ -373,6 +373,9 @@ export abstract class AbstractScrollableElement extends Widget { } private _onMouseWheel(e: StandardWheelEvent): void { + if (e.browserEvent?.defaultPrevented) { + return; + } const classifier = MouseWheelClassifier.INSTANCE; if (SCROLL_WHEEL_SMOOTH_SCROLL_ENABLED) { @@ -388,7 +391,13 @@ export abstract class AbstractScrollableElement extends Widget { let deltaX = e.deltaX * this._options.mouseWheelScrollSensitivity; if (this._options.scrollPredominantAxis) { - if (Math.abs(deltaY) >= Math.abs(deltaX)) { + if (this._options.scrollYToX && deltaX + deltaY === 0) { + // when configured to map Y to X and we both see + // no dominant axis and X and Y are competing with + // identical values into opposite directions, we + // ignore the delta as we cannot make a decision then + deltaX = deltaY = 0; + } else if (Math.abs(deltaY) >= Math.abs(deltaX)) { deltaX = 0; } else { deltaY = 0; diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts index f895c79d5f2..898d768e870 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts @@ -742,7 +742,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi return label; }, getWidgetAriaLabel: () => localize({ key: 'selectBox', comment: ['Behave like native select dropdown element.'] }, "Select Box"), - getRole: () => 'option', + getRole: () => isMacintosh ? '' : 'option', getWidgetRole: () => 'listbox' } }); diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts index 531d030f6eb..b822db43751 100644 --- a/src/vs/base/browser/ui/splitview/splitview.ts +++ b/src/vs/base/browser/ui/splitview/splitview.ts @@ -259,7 +259,7 @@ abstract class ViewItem { constructor( protected container: HTMLElement, - private view: IView, + readonly view: IView, size: ViewItemSize, private disposable: IDisposable ) { @@ -280,9 +280,8 @@ abstract class ViewItem { abstract layoutContainer(offset: number): void; - dispose(): IView { + dispose(): void { this.disposable.dispose(); - return this.view; } } @@ -343,6 +342,12 @@ export type DistributeSizing = { type: 'distribute' }; */ export type SplitSizing = { type: 'split'; index: number }; +/** + * When adding a view, use DistributeSizing when all pre-existing views are + * distributed evenly, otherwise use SplitSizing. + */ +export type AutoSizing = { type: 'auto'; index: number }; + /** * When adding or removing views, assume the view is invisible. */ @@ -352,7 +357,7 @@ export type InvisibleSizing = { type: 'invisible'; cachedVisibleSize: number }; * When adding or removing views, the sizing provides fine grained * control over how other views get resized. */ -export type Sizing = DistributeSizing | SplitSizing | InvisibleSizing; +export type Sizing = DistributeSizing | SplitSizing | AutoSizing | InvisibleSizing; export namespace Sizing { @@ -368,6 +373,12 @@ export namespace Sizing { */ export function Split(index: number): SplitSizing { return { type: 'split', index }; } + /** + * When adding a view, use DistributeSizing when all pre-existing views are + * distributed evenly, otherwise use SplitSizing. + */ + export function Auto(index: number): AutoSizing { return { type: 'auto', index }; } + /** * When adding or removing views, assume the view is invisible. */ @@ -646,9 +657,24 @@ export class SplitView extends Disposable { throw new Error('Index out of bounds'); } + if (sizing?.type === 'auto') { + if (this.areViewsDistributed()) { + sizing = { type: 'distribute' }; + } else { + sizing = { type: 'split', index: sizing.index }; + } + } + + // Save referene view, in case of `split` sizing + const referenceViewItem = sizing?.type === 'split' ? this.viewItems[sizing.index] : undefined; + // Remove view - const viewItem = this.viewItems.splice(index, 1)[0]; - const view = viewItem.dispose(); + const viewItemToRemove = this.viewItems.splice(index, 1)[0]; + + // Resize reference view, in case of `split` sizing + if (referenceViewItem) { + referenceViewItem.size += viewItemToRemove.size; + } // Remove sash if (this.viewItems.length >= 1) { @@ -664,7 +690,9 @@ export class SplitView extends Disposable { this.distributeViewSizes(); } - return view; + const result = viewItemToRemove.view; + viewItemToRemove.dispose(); + return result; } /** @@ -1054,12 +1082,22 @@ export class SplitView extends Disposable { if (typeof size === 'number') { viewSize = size; - } else if (size.type === 'split') { - viewSize = this.getViewSize(size.index) / 2; - } else if (size.type === 'invisible') { - viewSize = { cachedVisibleSize: size.cachedVisibleSize }; } else { - viewSize = view.minimumSize; + if (size.type === 'auto') { + if (this.areViewsDistributed()) { + size = { type: 'distribute' }; + } else { + size = { type: 'split', index: size.index }; + } + } + + if (size.type === 'split') { + viewSize = this.getViewSize(size.index) / 2; + } else if (size.type === 'invisible') { + viewSize = { cachedVisibleSize: size.cachedVisibleSize }; + } else { + viewSize = view.minimumSize; + } } const item = this.orientation === Orientation.VERTICAL @@ -1382,6 +1420,21 @@ export class SplitView extends Disposable { return undefined; } + private areViewsDistributed() { + let min = undefined, max = undefined; + + for (const view of this.viewItems) { + min = min === undefined ? view.size : Math.min(min, view.size); + max = max === undefined ? view.size : Math.max(max, view.size); + + if (max - min > 2) { + return false; + } + } + + return true; + } + override dispose(): void { this.sashDragState?.disposable.dispose(); diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts index a4e2ca94183..85936d72ce6 100644 --- a/src/vs/base/browser/ui/toolbar/toolbar.ts +++ b/src/vs/base/browser/ui/toolbar/toolbar.ts @@ -30,6 +30,7 @@ export interface IToolBarOptions { renderDropdownAsChildElement?: boolean; moreIcon?: ThemeIcon; allowContextMenu?: boolean; + skipTelemetry?: boolean; } /** @@ -78,7 +79,8 @@ export class ToolBar extends Disposable { keybindingProvider: this.options.getKeyBinding, classNames: ThemeIcon.asClassNameArray(options.moreIcon ?? Codicon.toolBarMore), anchorAlignmentProvider: this.options.anchorAlignmentProvider, - menuAsChild: !!this.options.renderDropdownAsChildElement + menuAsChild: !!this.options.renderDropdownAsChildElement, + skipTelemetry: this.options.skipTelemetry } ); this.toggleMenuActionViewItem.setActionContext(this.actionBar.context); @@ -106,7 +108,8 @@ export class ToolBar extends Disposable { keybindingProvider: this.options.getKeyBinding, classNames: action.class, anchorAlignmentProvider: this.options.anchorAlignmentProvider, - menuAsChild: !!this.options.renderDropdownAsChildElement + menuAsChild: !!this.options.renderDropdownAsChildElement, + skipTelemetry: this.options.skipTelemetry } ); result.setActionContext(this.actionBar.context); diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts index 9b4744734eb..3591193bab9 100644 --- a/src/vs/base/browser/ui/tree/abstractTree.ts +++ b/src/vs/base/browser/ui/tree/abstractTree.ts @@ -1706,10 +1706,18 @@ export abstract class AbstractTree implements IDisposable return this.view.contentHeight; } + get contentWidth(): number { + return this.view.contentWidth; + } + get onDidChangeContentHeight(): Event { return this.view.onDidChangeContentHeight; } + get onDidChangeContentWidth(): Event { + return this.view.onDidChangeContentWidth; + } + get scrollTop(): number { return this.view.scrollTop; } diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts index e996ae8bc21..3b4d493144b 100644 --- a/src/vs/base/browser/ui/tree/asyncDataTree.ts +++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts @@ -438,10 +438,18 @@ export class AsyncDataTree implements IDisposable return this.tree.contentHeight; } + get contentWidth(): number { + return this.tree.contentWidth; + } + get onDidChangeContentHeight(): Event { return this.tree.onDidChangeContentHeight; } + get onDidChangeContentWidth(): Event { + return this.tree.onDidChangeContentWidth; + } + get scrollTop(): number { return this.tree.scrollTop; } diff --git a/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts index 241c26daf23..c7a6f5e0634 100644 --- a/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts +++ b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts @@ -7,6 +7,7 @@ import { IIdentityProvider } from 'vs/base/browser/ui/list/list'; import { IIndexTreeModelSpliceOptions, IList } from 'vs/base/browser/ui/tree/indexTreeModel'; import { IObjectTreeModel, IObjectTreeModelOptions, IObjectTreeModelSetChildrenOptions, ObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel'; import { ICollapseStateChangeEvent, IObjectTreeElement, ITreeModel, ITreeModelSpliceEvent, ITreeNode, TreeError, TreeFilterResult, TreeVisibility, WeakMapper } from 'vs/base/browser/ui/tree/tree'; +import { equals } from 'vs/base/common/arrays'; import { Event } from 'vs/base/common/event'; import { Iterable } from 'vs/base/common/iterator'; @@ -146,7 +147,7 @@ export class CompressedObjectTreeModel, TFilterData e children: Iterable> = Iterable.empty(), options: IObjectTreeModelSetChildrenOptions, ): void { - // Diffs must be deem, since the compression can affect nested elements. + // Diffs must be deep, since the compression can affect nested elements. // @see https://github.com/microsoft/vscode/pull/114237#issuecomment-759425034 const diffIdentityProvider = options.diffIdentityProvider && wrapIdentityProvider(options.diffIdentityProvider); @@ -170,6 +171,16 @@ export class CompressedObjectTreeModel, TFilterData e const splicedElement = splice(decompressedElement, element, children); const recompressedElement = (this.enabled ? compress : noCompress)(splicedElement); + // If the recompressed node is identical to the original, just set its children. + // Saves work and churn diffing the parent element. + const elementComparator = options.diffIdentityProvider + ? ((a: T, b: T) => options.diffIdentityProvider!.getId(a) === options.diffIdentityProvider!.getId(b)) + : undefined; + if (equals(recompressedElement.element.elements, node.element.elements, elementComparator)) { + this._setChildren(compressedNode, recompressedElement.children || Iterable.empty(), { diffIdentityProvider, diffDepth: 1 }); + return; + } + const parentChildren = parent.children .map(child => child === node ? recompressedElement : child); diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts index 94e8650f2de..262badedf9f 100644 --- a/src/vs/base/browser/ui/tree/tree.ts +++ b/src/vs/base/browser/ui/tree/tree.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IDragAndDropData } from 'vs/base/browser/dnd'; +import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { IListDragAndDrop, IListDragOverReaction, IListRenderer, ListDragOverEffect } from 'vs/base/browser/ui/list/list'; import { Event } from 'vs/base/common/event'; @@ -176,7 +177,7 @@ export interface ITreeMouseEvent { export interface ITreeContextMenuEvent { readonly browserEvent: UIEvent; readonly element: T | null; - readonly anchor: HTMLElement | { readonly x: number; readonly y: number }; + readonly anchor: HTMLElement | IMouseEvent; } export interface ITreeNavigator { diff --git a/src/vs/base/common/amd.ts b/src/vs/base/common/amd.ts index fdbdb2e1030..2ee86a98646 100644 --- a/src/vs/base/common/amd.ts +++ b/src/vs/base/common/amd.ts @@ -3,6 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +// ESM-comment-begin +export const isESM = false; +// ESM-comment-end +// ESM-uncomment-begin +// export const isESM = true; +// ESM-uncomment-end + export abstract class LoaderStats { abstract get amdLoad(): [string, number][]; abstract get amdInvoke(): [string, number][]; @@ -41,7 +48,7 @@ export abstract class LoaderStats { } let stats: readonly LoaderEvent[] = []; - if (typeof require.getStats === 'function') { + if (typeof require === 'function' && typeof require.getStats === 'function') { stats = require.getStats().slice(0).sort((a, b) => a.timestamp - b.timestamp); } diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts index c22e14f3b7d..a54c2c59f9c 100644 --- a/src/vs/base/common/arrays.ts +++ b/src/vs/base/common/arrays.ts @@ -398,14 +398,14 @@ export function uniqueFilter(keyFn: (t: T) => R): (t: T) => boolean { } export function findLast(arr: readonly T[], predicate: (item: T) => boolean): T | undefined { - const idx = lastIndex(arr, predicate); + const idx = findLastIndex(arr, predicate); if (idx === -1) { return undefined; } return arr[idx]; } -export function lastIndex(array: ReadonlyArray, fn: (item: T) => boolean): number { +export function findLastIndex(array: ReadonlyArray, fn: (item: T) => boolean): number { for (let i = array.length - 1; i >= 0; i--) { const element = array[i]; @@ -707,6 +707,10 @@ export function tieBreakComparators(...comparators: Comparator[]): */ export const numberComparator: Comparator = (a, b) => a - b; +export function reverseOrder(comparator: Comparator): Comparator { + return (a, b) => -comparator(a, b); +} + /** * Returns the first item that is equal to or greater than every other item. */ diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts index f1af44098af..e00f3d59653 100644 --- a/src/vs/base/common/async.ts +++ b/src/vs/base/common/async.ts @@ -166,12 +166,14 @@ export interface ITask { * throttler.queue(deliver); * } */ -export class Throttler { +export class Throttler implements IDisposable { private activePromise: Promise | null; private queuedPromise: Promise | null; private queuedPromiseFactory: ITask> | null; + private isDisposed = false; + constructor() { this.activePromise = null; this.queuedPromise = null; @@ -179,6 +181,10 @@ export class Throttler { } queue(promiseFactory: ITask>): Promise { + if (this.isDisposed) { + throw new Error('Throttler is disposed'); + } + if (this.activePromise) { this.queuedPromiseFactory = promiseFactory; @@ -186,6 +192,10 @@ export class Throttler { const onComplete = () => { this.queuedPromise = null; + if (this.isDisposed) { + return; + } + const result = this.queue(this.queuedPromiseFactory!); this.queuedPromiseFactory = null; @@ -214,6 +224,10 @@ export class Throttler { }); }); } + + dispose(): void { + this.isDisposed = true; + } } export class Sequencer { @@ -403,6 +417,7 @@ export class ThrottledDelayer { dispose(): void { this.delayer.dispose(); + this.throttler.dispose(); } } diff --git a/src/vs/base/common/buffer.ts b/src/vs/base/common/buffer.ts index ff61eb5c9e2..08736ab8c0b 100644 --- a/src/vs/base/common/buffer.ts +++ b/src/vs/base/common/buffer.ts @@ -172,53 +172,59 @@ export class VSBuffer { writeUInt8(this.buffer, value, offset); } - indexOf(subarray: VSBuffer | Uint8Array) { - const needle = subarray instanceof VSBuffer ? subarray.buffer : subarray; - const needleLen = needle.byteLength; - const haystack = this.buffer; - const haystackLen = haystack.byteLength; - - if (needleLen === 0) { - return 0; - } - - if (needleLen === 1) { - return haystack.indexOf(needle[0]); - } - - if (needleLen > haystackLen) { - return -1; - } - - // find index of the subarray using boyer-moore-horspool algorithm - const table = indexOfTable.value; - table.fill(needle.length); - for (let i = 0; i < needle.length; i++) { - table[needle[i]] = needle.length - i - 1; - } - - let i = needle.length - 1; - let j = i; - let result = -1; - while (i < haystackLen) { - if (haystack[i] === needle[j]) { - if (j === 0) { - result = i; - break; - } - - i--; - j--; - } else { - i += Math.max(needle.length - j, table[haystack[i]]); - j = needle.length - 1; - } - } - - return result; + indexOf(subarray: VSBuffer | Uint8Array, offset = 0) { + return binaryIndexOf(this.buffer, subarray instanceof VSBuffer ? subarray.buffer : subarray, offset); } } +/** + * Like String.indexOf, but works on Uint8Arrays. + * Uses the boyer-moore-horspool algorithm to be reasonably speedy. + */ +export function binaryIndexOf(haystack: Uint8Array, needle: Uint8Array, offset = 0): number { + const needleLen = needle.byteLength; + const haystackLen = haystack.byteLength; + + if (needleLen === 0) { + return 0; + } + + if (needleLen === 1) { + return haystack.indexOf(needle[0]); + } + + if (needleLen > haystackLen - offset) { + return -1; + } + + // find index of the subarray using boyer-moore-horspool algorithm + const table = indexOfTable.value; + table.fill(needle.length); + for (let i = 0; i < needle.length; i++) { + table[needle[i]] = needle.length - i - 1; + } + + let i = offset + needle.length - 1; + let j = i; + let result = -1; + while (i < haystackLen) { + if (haystack[i] === needle[j]) { + if (j === 0) { + result = i; + break; + } + + i--; + j--; + } else { + i += Math.max(needle.length - j, table[haystack[i]]); + j = needle.length - 1; + } + } + + return result; +} + export function readUInt16LE(source: Uint8Array, offset: number): number { return ( ((source[offset + 0] << 0) >>> 0) | diff --git a/src/vs/base/common/codicons.ts b/src/vs/base/common/codicons.ts index f205af33b4c..48dd3abfb72 100644 --- a/src/vs/base/common/codicons.ts +++ b/src/vs/base/common/codicons.ts @@ -60,6 +60,7 @@ export const Codicon = { tag: register('tag', 0xea66), tagAdd: register('tag-add', 0xea66), tagRemove: register('tag-remove', 0xea66), + gitPullRequestLabel: register('git-pull-request-label', 0xea66), person: register('person', 0xea67), personFollow: register('person-follow', 0xea67), personOutline: register('person-outline', 0xea67), @@ -314,6 +315,7 @@ export const Codicon = { megaphone: register('megaphone', 0xeb1e), mention: register('mention', 0xeb1f), milestone: register('milestone', 0xeb20), + gitPullRequestMilestone: register('git-pull-request-milestone', 0xeb20), mortarBoard: register('mortar-board', 0xeb21), move: register('move', 0xeb22), multipleWindows: register('multiple-windows', 0xeb23), @@ -438,9 +440,11 @@ export const Codicon = { menu: register('menu', 0xeb94), expandAll: register('expand-all', 0xeb95), feedback: register('feedback', 0xeb96), + gitPullRequestReviewer: register('git-pull-request-reviewer', 0xeb96), groupByRefType: register('group-by-ref-type', 0xeb97), ungroupByRefType: register('ungroup-by-ref-type', 0xeb98), account: register('account', 0xeb99), + gitPullRequestAssignee: register('git-pull-request-assignee', 0xeb99), bellDot: register('bell-dot', 0xeb9a), debugConsole: register('debug-console', 0xeb9b), library: register('library', 0xeb9c), diff --git a/src/vs/base/common/collections.ts b/src/vs/base/common/collections.ts index d8ee92f757e..8fdf74b05be 100644 --- a/src/vs/base/common/collections.ts +++ b/src/vs/base/common/collections.ts @@ -101,4 +101,12 @@ export class SetMap { values.forEach(fn); } + + get(key: K): ReadonlySet { + const values = this.map.get(key); + if (!values) { + return new Set(); + } + return values; + } } diff --git a/src/vs/base/common/console.ts b/src/vs/base/common/console.ts index 54bfadefbae..6527f72f5e1 100644 --- a/src/vs/base/common/console.ts +++ b/src/vs/base/common/console.ts @@ -125,7 +125,7 @@ export function log(entry: IRemoteConsoleLog, label: string): void { consoleArgs = [`%c[${label}]%`, color('blue'), ...args]; } - // Stack: add to args unless already aded + // Stack: add to args unless already added if (topFrame && !isOneStringArg) { consoleArgs.push(topFrame); } diff --git a/src/vs/base/common/errors.ts b/src/vs/base/common/errors.ts index 63f5a2f8c51..a558a0b06d8 100644 --- a/src/vs/base/common/errors.ts +++ b/src/vs/base/common/errors.ts @@ -74,6 +74,7 @@ export class ErrorHandler { export const errorHandler = new ErrorHandler(); +/** @skipMangle */ export function setUnexpectedErrorHandler(newUnexpectedErrorHandler: (e: any) => void): void { errorHandler.setUnexpectedErrorHandler(newUnexpectedErrorHandler); } diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts index 24547947c56..872263f2e9e 100644 --- a/src/vs/base/common/event.ts +++ b/src/vs/base/common/event.ts @@ -6,7 +6,7 @@ import { CancellationToken } from 'vs/base/common/cancellation'; import { onUnexpectedError } from 'vs/base/common/errors'; import { once as onceFn } from 'vs/base/common/functional'; -import { combinedDisposable, Disposable, DisposableStore, IDisposable, SafeDisposable, toDisposable } from 'vs/base/common/lifecycle'; +import { combinedDisposable, Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { LinkedList } from 'vs/base/common/linkedList'; import { IObservable, IObserver } from 'vs/base/common/observable'; import { StopWatch } from 'vs/base/common/stopwatch'; @@ -682,6 +682,7 @@ export namespace Event { } }; observable.addObserver(observer); + observable.reportChanges(); return { dispose() { observable.removeObserver(observer); @@ -755,7 +756,7 @@ export class EventProfiling { } start(listenerCount: number): void { - this._stopWatch = new StopWatch(true); + this._stopWatch = new StopWatch(); this.listenerCount = listenerCount; } @@ -848,20 +849,29 @@ class Stacktrace { } } -class Listener { - - readonly subscription = new SafeDisposable(); - - constructor( - readonly callback: (e: T) => void, - readonly callbackThis: any | undefined, - readonly stack: Stacktrace | undefined - ) { } - - invoke(e: T) { - this.callback.call(this.callbackThis, e); - } +let id = 0; +class UniqueContainer { + stack?: Stacktrace; + public id = id++; + constructor(public readonly value: T) { } } +const compactionThreshold = 2; + +type ListenerContainer = UniqueContainer<(data: T) => void>; +type ListenerOrListeners = (ListenerContainer | undefined)[] | ListenerContainer; + +const forEachListener = (listeners: ListenerOrListeners, fn: (c: ListenerContainer) => void) => { + if (listeners instanceof UniqueContainer) { + fn(listeners); + } else { + for (let i = 0; i < listeners.length; i++) { + const l = listeners[i]; + if (l) { + fn(l); + } + } + } +}; /** * The Emitter can be used to expose an Event to the public @@ -889,16 +899,41 @@ export class Emitter { private readonly _options?: EmitterOptions; private readonly _leakageMon?: LeakageMonitor; private readonly _perfMon?: EventProfiling; - private _disposed: boolean = false; + private _disposed?: true; private _event?: Event; - private _deliveryQueue?: EventDeliveryQueue; - protected _listeners?: LinkedList>; + + /** + * A listener, or list of listeners. A single listener is the most common + * for event emitters (#185789), so we optimize that special case to avoid + * wrapping it in an array (just like Node.js itself.) + * + * A list of listeners never 'downgrades' back to a plain function if + * listeners are removed, for two reasons: + * + * 1. That's complicated (especially with the deliveryQueue) + * 2. A listener with >1 listener is likely to have >1 listener again at + * some point, and swapping between arrays and functions may[citation needed] + * introduce unnecessary work and garbage. + * + * The array listeners can be 'sparse', to avoid reallocating the array + * whenever any listener is added or removed. If more than `1 / compactionThreshold` + * of the array is empty, only then is it resized. + */ + protected _listeners?: ListenerOrListeners; + + /** + * Always to be defined if _listeners is an array. It's no longer a true + * queue, but holds the dispatching 'state'. If `fire()` is called on an + * emitter, any work left in the _deliveryQueue is finished first. + */ + private _deliveryQueue?: EventDeliveryQueuePrivate; + protected _size = 0; constructor(options?: EmitterOptions) { this._options = options; this._leakageMon = _globalLeakWarningThreshold > 0 || this._options?.leakWarningThreshold ? new LeakageMonitor(this._options?.leakWarningThreshold ?? _globalLeakWarningThreshold) : undefined; this._perfMon = this._options?._profName ? new EventProfiling(this._options._profName) : undefined; - this._deliveryQueue = this._options?.deliveryQueue; + this._deliveryQueue = this._options?.deliveryQueue as EventDeliveryQueuePrivate | undefined; } dispose() { @@ -915,22 +950,20 @@ export class Emitter { // ...later... // this._disposables.dispose(); disposes (1) then (2): don't warn after (1) but after the "overall dispose" is done + if (this._deliveryQueue?.current === this) { + this._deliveryQueue.reset(); + } if (this._listeners) { if (_enableDisposeWithListenerWarning) { - const listeners = Array.from(this._listeners); + const listeners = this._listeners; queueMicrotask(() => { - for (const listener of listeners) { - if (listener.subscription.isset()) { - listener.subscription.unset(); - listener.stack?.print(); - } - } + forEachListener(listeners, l => l.stack?.print()); }); } - this._listeners.clear(); + this._listeners = undefined; + this._size = 0; } - this._deliveryQueue?.clear(this); this._options?.onDidRemoveLastListener?.(); this._leakageMon?.dispose(); } @@ -941,162 +974,204 @@ export class Emitter { * to events from this Emitter */ get event(): Event { - if (!this._event) { - this._event = (callback: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => { - if (!this._listeners) { - this._listeners = new LinkedList(); - } + this._event ??= (callback: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore) => { + if (this._leakageMon && this._size > this._leakageMon.threshold * 3) { + console.warn(`[${this._leakageMon.name}] REFUSES to accept new listeners because it exceeded its threshold by far`); + return Disposable.None; + } - if (this._leakageMon && this._listeners.size > this._leakageMon.threshold * 3) { - console.warn(`[${this._leakageMon.name}] REFUSES to accept new listeners because it exceeded its threshold by far`); - return Disposable.None; - } + if (this._disposed) { + // todo: should we warn if a listener is added to a disposed emitter? This happens often + return Disposable.None; + } - const firstListener = this._listeners.isEmpty(); + if (thisArgs) { + callback = callback.bind(thisArgs); + } - if (firstListener && this._options?.onWillAddFirstListener) { - this._options.onWillAddFirstListener(this); - } + const contained = new UniqueContainer(callback); - let removeMonitor: Function | undefined; - let stack: Stacktrace | undefined; - if (this._leakageMon && this._listeners.size >= Math.ceil(this._leakageMon.threshold * 0.2)) { - // check and record this emitter for potential leakage - stack = Stacktrace.create(); - removeMonitor = this._leakageMon.check(stack, this._listeners.size + 1); - } + let removeMonitor: Function | undefined; + let stack: Stacktrace | undefined; + if (this._leakageMon && this._size >= Math.ceil(this._leakageMon.threshold * 0.2)) { + // check and record this emitter for potential leakage + contained.stack = Stacktrace.create(); + removeMonitor = this._leakageMon.check(contained.stack, this._size + 1); + } - if (_enableDisposeWithListenerWarning) { - stack = stack ?? Stacktrace.create(); - } + if (_enableDisposeWithListenerWarning) { + contained.stack = stack ?? Stacktrace.create(); + } - const listener = new Listener(callback, thisArgs, stack); - const removeListener = this._listeners.push(listener); + if (!this._listeners) { + this._options?.onWillAddFirstListener?.(this); + this._listeners = contained; + this._options?.onDidAddFirstListener?.(this); + } else if (this._listeners instanceof UniqueContainer) { + this._deliveryQueue ??= new EventDeliveryQueuePrivate(); + this._listeners = [this._listeners, contained]; + } else { + this._listeners.push(contained); + } - if (firstListener && this._options?.onDidAddFirstListener) { - this._options.onDidAddFirstListener(this); - } + this._size++; - if (this._options?.onDidAddListener) { - this._options.onDidAddListener(this, callback, thisArgs); - } + const result = toDisposable(() => { removeMonitor?.(); this._removeListener(contained); }); + if (disposables instanceof DisposableStore) { + disposables.add(result); + } else if (Array.isArray(disposables)) { + disposables.push(result); + } - const result = listener.subscription.set(() => { - removeMonitor?.(); - if (!this._disposed) { - this._options?.onWillRemoveListener?.(this); - removeListener(); - if (this._options && this._options.onDidRemoveLastListener) { - const hasListeners = (this._listeners && !this._listeners.isEmpty()); - if (!hasListeners) { - this._options.onDidRemoveLastListener(this); - } - } - } - }); + return result; + }; - if (disposables instanceof DisposableStore) { - disposables.add(result); - } else if (Array.isArray(disposables)) { - disposables.push(result); - } - - return result; - }; - } return this._event; } + private _removeListener(listener: ListenerContainer) { + this._options?.onWillRemoveListener?.(this); + + if (!this._listeners) { + return; // expected if a listener gets disposed + } + + if (this._size === 1) { + this._listeners = undefined; + this._options?.onDidRemoveLastListener?.(this); + this._size = 0; + return; + } + + // size > 1 which requires that listeners be a list: + const listeners = this._listeners as (ListenerContainer | undefined)[]; + + const index = listeners.indexOf(listener); + if (index === -1) { + console.log('disposed?', this._disposed); + console.log('size?', this._size); + console.log('arr?', JSON.stringify(this._listeners)); + throw new Error('Attempted to dispose unknown listener'); + } + + this._size--; + listeners[index] = undefined; + + const adjustDeliveryQueue = this._deliveryQueue!.current === this; + if (this._size * compactionThreshold <= listeners.length) { + let n = 0; + for (let i = 0; i < listeners.length; i++) { + if (listeners[i]) { + listeners[n++] = listeners[i]; + } else if (adjustDeliveryQueue) { + this._deliveryQueue!.end--; + if (n < this._deliveryQueue!.i) { + this._deliveryQueue!.i--; + } + } + } + listeners.length = n; + } + } + + private _deliver(listener: undefined | UniqueContainer<(value: T) => void>, value: T) { + if (!listener) { + return; + } + + const errorHandler = this._options?.onListenerError || onUnexpectedError; + if (!errorHandler) { + listener.value(value); + return; + } + + try { + listener.value(value); + } catch (e) { + errorHandler(e); + } + } + + /** Delivers items in the queue. Assumes the queue is ready to go. */ + private _deliverQueue(dq: EventDeliveryQueuePrivate) { + const listeners = dq.current!._listeners! as (ListenerContainer | undefined)[]; + while (dq.i < dq.end) { + // important: dq.i is incremented before calling deliver() because it might reenter deliverQueue() + this._deliver(listeners[dq.i++], dq.value as T); + } + dq.reset(); + } + /** * To be kept private to fire an event to * subscribers */ fire(event: T): void { - if (this._listeners) { - // put all [listener,event]-pairs into delivery queue - // then emit all event. an inner/nested event might be - // the driver of this - - if (!this._deliveryQueue) { - this._deliveryQueue = new PrivateEventDeliveryQueue(this._options?.onListenerError); - } - - for (const listener of this._listeners) { - this._deliveryQueue.push(this, listener, event); - } - - // start/stop performance insight collection - this._perfMon?.start(this._deliveryQueue.size); - - this._deliveryQueue.deliver(); - - this._perfMon?.stop(); + if (this._deliveryQueue?.current) { + this._deliverQueue(this._deliveryQueue); + this._perfMon?.stop(); // last fire() will have starting perfmon, stop it before starting the next dispatch } + + this._perfMon?.start(this._size); + + if (!this._listeners) { + // no-op + } else if (this._listeners instanceof UniqueContainer) { + this._deliver(this._listeners, event); + } else { + const dq = this._deliveryQueue!; + dq.enqueue(this, event, this._listeners.length); + this._deliverQueue(dq); + } + + this._perfMon?.stop(); } hasListeners(): boolean { - if (!this._listeners) { - return false; - } - return !this._listeners.isEmpty(); + return this._size > 0; } } -export class EventDeliveryQueue { - - protected _queue = new LinkedList(); - - constructor( - private readonly _onListenerError: (e: any) => void = onUnexpectedError - ) { } - - get size(): number { - return this._queue.size; - } - - push(emitter: Emitter, listener: Listener, event: T): void { - this._queue.push(new EventDeliveryQueueElement(emitter, listener, event)); - } - - clear(emitter: Emitter): void { - const newQueue = new LinkedList(); - for (const element of this._queue) { - if (element.emitter !== emitter) { - newQueue.push(element); - } - } - this._queue = newQueue; - } - - deliver(): void { - while (this._queue.size > 0) { - const element = this._queue.shift()!; - try { - element.listener.invoke(element.event); - } catch (e) { - this._onListenerError(e); - } - } - } +export interface EventDeliveryQueue { + _isEventDeliveryQueue: true; } -/** - * An `EventDeliveryQueue` that is guaranteed to be used by a single `Emitter`. - */ -class PrivateEventDeliveryQueue extends EventDeliveryQueue { - override clear(emitter: Emitter): void { - // Here we can just clear the entire linked list because - // all elements are guaranteed to belong to this emitter - this._queue.clear(); - } -} +export const createEventDeliveryQueue = (): EventDeliveryQueue => new EventDeliveryQueuePrivate(); -class EventDeliveryQueueElement { - constructor( - readonly emitter: Emitter, - readonly listener: Listener, - readonly event: T - ) { } +class EventDeliveryQueuePrivate implements EventDeliveryQueue { + declare _isEventDeliveryQueue: true; + + /** + * Index in current's listener list. + */ + public i = -1; + + /** + * The last index in the listener's list to deliver. + */ + public end = 0; + + /** + * Emitter currently being dispatched on. Emitter._listeners is always an array. + */ + public current?: Emitter; + /** + * Currently emitting value. Defined whenever `current` is. + */ + public value?: unknown; + + public enqueue(emitter: Emitter, value: T, end: number) { + this.i = 0; + this.end = end; + this.current = emitter; + this.value = value; + } + + public reset() { + this.i = this.end; // force any current emission loop to stop, mainly for during dispose + this.current = undefined; + this.value = undefined; + } } export interface IWaitUntil { @@ -1108,7 +1183,7 @@ export type IWaitUntilData = Omit, 'token'>; export class AsyncEmitter extends Emitter { - private _asyncDeliveryQueue?: LinkedList<[Listener, IWaitUntilData]>; + private _asyncDeliveryQueue?: LinkedList<[(ev: T) => void, IWaitUntilData]>; async fireAsync(data: IWaitUntilData, token: CancellationToken, promiseJoin?: (p: Promise, listener: Function) => Promise): Promise { if (!this._listeners) { @@ -1119,9 +1194,7 @@ export class AsyncEmitter extends Emitter { this._asyncDeliveryQueue = new LinkedList(); } - for (const listener of this._listeners) { - this._asyncDeliveryQueue.push([listener, data]); - } + forEachListener(this._listeners, listener => this._asyncDeliveryQueue!.push([listener.value, data])); while (this._asyncDeliveryQueue.size > 0 && !token.isCancellationRequested) { @@ -1136,14 +1209,14 @@ export class AsyncEmitter extends Emitter { throw new Error('waitUntil can NOT be called asynchronous'); } if (promiseJoin) { - p = promiseJoin(p, listener.callback); + p = promiseJoin(p, listener); } thenables.push(p); } }; try { - listener.invoke(event); + listener(event); } catch (e) { onUnexpectedError(e); continue; @@ -1206,7 +1279,7 @@ export class PauseableEmitter extends Emitter { } override fire(event: T): void { - if (this._listeners) { + if (this._size) { if (this._isPaused !== 0) { this._eventQueue.push(event); } else { diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts index c3b79a8e2e0..b62f09f07ca 100644 --- a/src/vs/base/common/htmlContent.ts +++ b/src/vs/base/common/htmlContent.ts @@ -58,9 +58,9 @@ export class MarkdownString implements IMarkdownString { appendText(value: string, newlineStyle: MarkdownStringTextNewlineStyle = MarkdownStringTextNewlineStyle.Paragraph): MarkdownString { this.value += escapeMarkdownSyntaxTokens(this.supportThemeIcons ? escapeIcons(value) : value) - .replace(/([ \t]+)/g, (_match, g1) => ' '.repeat(g1.length)) - .replace(/\>/gm, '\\>') - .replace(/\n/g, newlineStyle === MarkdownStringTextNewlineStyle.Break ? '\\\n' : '\n\n'); + .replace(/([ \t]+)/g, (_match, g1) => ' '.repeat(g1.length)) // CodeQL [SM02383] The Markdown is fully sanitized after being rendered. + .replace(/\>/gm, '\\>') // CodeQL [SM02383] The Markdown is fully sanitized after being rendered. + .replace(/\n/g, newlineStyle === MarkdownStringTextNewlineStyle.Break ? '\\\n' : '\n\n'); // CodeQL [SM02383] The Markdown is fully sanitized after being rendered. return this; } @@ -140,7 +140,7 @@ export function markdownStringEqual(a: IMarkdownString, b: IMarkdownString): boo export function escapeMarkdownSyntaxTokens(text: string): string { // escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash - return text.replace(/[\\`*_{}[\]()#+\-!~]/g, '\\$&'); + return text.replace(/[\\`*_{}[\]()#+\-!~]/g, '\\$&'); // CodeQL [SM02383] Backslash is escaped in the character class } export function escapeDoubleQuotes(input: string) { diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts index 95b4518feee..707ed621b22 100644 --- a/src/vs/base/common/labels.ts +++ b/src/vs/base/common/labels.ts @@ -436,9 +436,21 @@ export function unmnemonicLabel(label: string): string { } /** - * Splits a path in name and parent path, supporting both '/' and '\' + * Splits a recent label in name and parent path, supporting both '/' and '\' and workspace suffixes */ -export function splitName(fullPath: string): { name: string; parentPath: string } { +export function splitRecentLabel(recentLabel: string) { + if (recentLabel.endsWith(']')) { + // label with workspace suffix + const lastIndexOfSquareBracket = recentLabel.lastIndexOf(' [', recentLabel.length - 2); + if (lastIndexOfSquareBracket !== -1) { + const split = splitName(recentLabel.substring(0, lastIndexOfSquareBracket)); + return { name: split.name, parentPath: split.parentPath + recentLabel.substring(lastIndexOfSquareBracket) }; + } + } + return splitName(recentLabel); +} + +function splitName(fullPath: string): { name: string; parentPath: string } { const p = fullPath.indexOf('/') !== -1 ? posix : win32; const name = p.basename(fullPath); const parentPath = p.dirname(fullPath); diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts index d58b2fa2155..c044d998203 100644 --- a/src/vs/base/common/lifecycle.ts +++ b/src/vs/base/common/lifecycle.ts @@ -187,6 +187,8 @@ export function combinedDisposable(...disposables: IDisposable[]): IDisposable { /** * Turn a function that implements dispose into an {@link IDisposable}. + * + * @param fn Clean up function, guaranteed to be called only **once**. */ export function toDisposable(fn: () => void): IDisposable { const self = trackDisposable({ diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts index 096790cc3d7..b00899c50db 100644 --- a/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts @@ -53,6 +53,8 @@ export namespace Schemas { export const vscodeRemoteResource = 'vscode-remote-resource'; + export const vscodeManagedRemoteResource = 'vscode-managed-remote-resource'; + export const vscodeUserData = 'vscode-userdata'; export const vscodeCustomEditor = 'vscode-custom-editor'; @@ -60,7 +62,6 @@ export namespace Schemas { export const vscodeNotebookCell = 'vscode-notebook-cell'; export const vscodeNotebookCellMetadata = 'vscode-notebook-cell-metadata'; export const vscodeNotebookCellOutput = 'vscode-notebook-cell-output'; - export const vscodeInteractive = 'vscode-interactive'; export const vscodeInteractiveInput = 'vscode-interactive-input'; export const vscodeSettings = 'vscode-settings'; @@ -69,7 +70,7 @@ export namespace Schemas { export const vscodeTerminal = 'vscode-terminal'; - export const vscodeInteractiveSesssion = 'vscode-chat-editor'; + export const vscodeChatSesssion = 'vscode-chat-editor'; /** * Scheme used internally for webviews that aren't linked to a resource (i.e. not custom editors) diff --git a/src/vs/base/common/objects.ts b/src/vs/base/common/objects.ts index 16333957989..897a9fd8249 100644 --- a/src/vs/base/common/objects.ts +++ b/src/vs/base/common/objects.ts @@ -230,10 +230,9 @@ export function filter(obj: obj, predicate: (key: string, value: any) => boolean export function getAllPropertyNames(obj: object): string[] { let res: string[] = []; - let proto = Object.getPrototypeOf(obj); - while (Object.prototype !== proto) { - res = res.concat(Object.getOwnPropertyNames(proto)); - proto = Object.getPrototypeOf(proto); + while (Object.prototype !== obj) { + res = res.concat(Object.getOwnPropertyNames(obj)); + obj = Object.getPrototypeOf(obj); } return res; } diff --git a/src/vs/base/common/observable.ts b/src/vs/base/common/observable.ts index c588d68b9f6..895ba31352d 100644 --- a/src/vs/base/common/observable.ts +++ b/src/vs/base/common/observable.ts @@ -10,19 +10,43 @@ export { ISettable, ISettableObservable, ITransaction, + IChangeContext, + IChangeTracker, observableValue, + disposableObservableValue, transaction, -} from 'vs/base/common/observableImpl/base'; -export { derived } from 'vs/base/common/observableImpl/derived'; + subtransaction, +} from 'vs/base/common/observableInternal/base'; +export { + derived, + derivedOpts, + derivedHandleChanges, + derivedWithStore, +} from 'vs/base/common/observableInternal/derived'; export { autorun, autorunDelta, autorunHandleChanges, autorunWithStore, -} from 'vs/base/common/observableImpl/autorun'; -export * from 'vs/base/common/observableImpl/utils'; + autorunOpts, + autorunWithStoreHandleChanges, +} from 'vs/base/common/observableInternal/autorun'; +export { + IObservableSignal, + constObservable, + debouncedObservable, + derivedObservableWithCache, + derivedObservableWithWritableCache, + keepAlive, + observableFromEvent, + observableFromPromise, + observableSignal, + observableSignalFromEvent, + waitForState, + wasEventTriggeredRecently, +} from 'vs/base/common/observableInternal/utils'; -import { ConsoleObservableLogger, setLogger } from 'vs/base/common/observableImpl/logging'; +import { ConsoleObservableLogger, setLogger } from 'vs/base/common/observableInternal/logging'; const enableLogging = false; if (enableLogging) { diff --git a/src/vs/base/common/observableImpl/autorun.ts b/src/vs/base/common/observableInternal/autorun.ts similarity index 63% rename from src/vs/base/common/observableImpl/autorun.ts rename to src/vs/base/common/observableInternal/autorun.ts index 423192914b6..482e592d883 100644 --- a/src/vs/base/common/observableImpl/autorun.ts +++ b/src/vs/base/common/observableInternal/autorun.ts @@ -3,33 +3,62 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { BugIndicatingError } from 'vs/base/common/errors'; +import { assertFn } from 'vs/base/common/assert'; import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; -import { IReader, IObservable, IObserver, IChangeContext } from 'vs/base/common/observableImpl/base'; -import { getLogger } from 'vs/base/common/observableImpl/logging'; +import { IReader, IObservable, IObserver, IChangeContext, getFunctionName } from 'vs/base/common/observableInternal/base'; +import { getLogger } from 'vs/base/common/observableInternal/logging'; -export function autorun(debugName: string, fn: (reader: IReader) => void): IDisposable { - return new AutorunObserver(debugName, fn, undefined, undefined); +export function autorunOpts(options: { debugName: string | (() => string | undefined) }, fn: (reader: IReader) => void): IDisposable { + return new AutorunObserver(options.debugName, fn, undefined, undefined); +} + +export function autorun(fn: (reader: IReader) => void): IDisposable { + return new AutorunObserver(undefined, fn, undefined, undefined); } export function autorunHandleChanges( - debugName: string, options: { + debugName?: string | (() => string | undefined); createEmptyChangeSummary?: () => TChangeSummary; handleChange: (context: IChangeContext, changeSummary: TChangeSummary) => boolean; }, fn: (reader: IReader, changeSummary: TChangeSummary) => void ): IDisposable { - return new AutorunObserver(debugName, fn, options.createEmptyChangeSummary, options.handleChange); + return new AutorunObserver(options.debugName, fn, options.createEmptyChangeSummary, options.handleChange); } -export function autorunWithStore( - fn: (reader: IReader, store: DisposableStore) => void, - debugName: string +export function autorunWithStoreHandleChanges( + options: { + debugName?: string | (() => string | undefined); + createEmptyChangeSummary?: () => TChangeSummary; + handleChange: (context: IChangeContext, changeSummary: TChangeSummary) => boolean; + }, + fn: (reader: IReader, changeSummary: TChangeSummary, store: DisposableStore) => void ): IDisposable { const store = new DisposableStore(); - const disposable = autorun( - debugName, + const disposable = autorunHandleChanges( + { + debugName: options.debugName ?? (() => getFunctionName(fn)), + createEmptyChangeSummary: options.createEmptyChangeSummary, + handleChange: options.handleChange, + }, + (reader, changeSummary) => { + store.clear(); + fn(reader, changeSummary, store); + } + ); + return toDisposable(() => { + disposable.dispose(); + store.dispose(); + }); +} + +export function autorunWithStore(fn: (reader: IReader, store: DisposableStore) => void): IDisposable { + const store = new DisposableStore(); + const disposable = autorunOpts( + { + debugName: () => getFunctionName(fn) || '(anonymous)', + }, reader => { store.clear(); fn(reader, store); @@ -63,9 +92,23 @@ export class AutorunObserver implements IObserver, IReader private dependenciesToBeRemoved = new Set>(); private changeSummary: TChangeSummary | undefined; + public get debugName(): string { + if (typeof this._debugName === 'string') { + return this._debugName; + } + if (typeof this._debugName === 'function') { + const name = this._debugName(); + if (name !== undefined) { return name; } + } + const name = getFunctionName(this._runFn); + if (name !== undefined) { return name; } + + return '(anonymous)'; + } + constructor( - public readonly debugName: string, - private readonly runFn: (reader: IReader, changeSummary: TChangeSummary) => void, + private readonly _debugName: string | (() => string | undefined) | undefined, + public readonly _runFn: (reader: IReader, changeSummary: TChangeSummary) => void, private readonly createChangeSummary: (() => TChangeSummary) | undefined, private readonly _handleChange: ((context: IChangeContext, summary: TChangeSummary) => boolean) | undefined, ) { @@ -93,13 +136,15 @@ export class AutorunObserver implements IObserver, IReader this.state = AutorunState.upToDate; - getLogger()?.handleAutorunTriggered(this); - try { - const changeSummary = this.changeSummary!; - this.changeSummary = this.createChangeSummary?.(); - this.runFn(this, changeSummary); + if (!this.disposed) { + getLogger()?.handleAutorunTriggered(this); + const changeSummary = this.changeSummary!; + this.changeSummary = this.createChangeSummary?.(); + this._runFn(this, changeSummary); + } } finally { + getLogger()?.handleAutorunFinished(this); // We don't want our observed observables to think that they are (not even temporarily) not being observed. // Thus, we only unsubscribe from observables that are definitely not read anymore. for (const o of this.dependenciesToBeRemoved) { @@ -140,19 +185,17 @@ export class AutorunObserver implements IObserver, IReader } this.updateCount--; - if (this.updateCount < 0) { - throw new BugIndicatingError(); - } + assertFn(() => this.updateCount >= 0); } public handlePossibleChange(observable: IObservable): void { - if (this.state === AutorunState.upToDate && this.dependencies.has(observable)) { + if (this.state === AutorunState.upToDate && this.dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) { this.state = AutorunState.dependenciesMightHaveChanged; } } public handleChange(observable: IObservable, change: TChange): void { - if (this.dependencies.has(observable)) { + if (this.dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) { const shouldReact = this._handleChange ? this._handleChange({ changedObservable: observable, change, @@ -182,13 +225,13 @@ export class AutorunObserver implements IObserver, IReader export namespace autorun { export const Observer = AutorunObserver; } + export function autorunDelta( - name: string, observable: IObservable, handler: (args: { lastValue: T | undefined; newValue: T }) => void ): IDisposable { let _lastValue: T | undefined; - return autorun(name, (reader) => { + return autorunOpts({ debugName: () => getFunctionName(handler) }, (reader) => { const newValue = observable.read(reader); const lastValue = _lastValue; _lastValue = newValue; diff --git a/src/vs/base/common/observableImpl/base.ts b/src/vs/base/common/observableInternal/base.ts similarity index 89% rename from src/vs/base/common/observableImpl/base.ts rename to src/vs/base/common/observableInternal/base.ts index 7fc48ddf273..23ba8d4af19 100644 --- a/src/vs/base/common/observableImpl/base.ts +++ b/src/vs/base/common/observableInternal/base.ts @@ -4,9 +4,14 @@ *--------------------------------------------------------------------------------------------*/ import { IDisposable } from 'vs/base/common/lifecycle'; -import type { derived } from 'vs/base/common/observableImpl/derived'; -import { getLogger } from 'vs/base/common/observableImpl/logging'; +import type { derived } from 'vs/base/common/observableInternal/derived'; +import { getLogger } from 'vs/base/common/observableInternal/logging'; +/** + * Represents an observable value. + * @template T The type of the value. + * @template TChange The type of delta information (usually `void` and only used in advanced scenarios). + */ export interface IObservable { /** * Returns the current value. @@ -157,11 +162,21 @@ export abstract class ConvenientObservable implements IObservable(fn: (value: T, reader: IReader) => TNew): IObservable { return _derived( + (reader) => fn(this.read(reader), reader), () => { const name = getFunctionName(fn); - return name !== undefined ? name : `${this.debugName} (mapped)`; + if (name !== undefined) { + return name; + } + + // regexp to match `x => x.y` where x and y can be arbitrary identifiers (uses backref): + const regexp = /^\s*\(?\s*([a-zA-Z_$][a-zA-Z_$0-9]*)\s*\)?\s*=>\s*\1\.([a-zA-Z_$][a-zA-Z_$0-9]*)\s*$/; + const match = regexp.exec(fn.toString()); + if (match) { + return `${this.debugName}.${match[2]}`; + } + return `${this.debugName} (mapped)`; }, - (reader) => fn(this.read(reader), reader) ); } @@ -193,11 +208,9 @@ export abstract class BaseObservable extends ConvenientObserv export function transaction(fn: (tx: ITransaction) => void, getDebugName?: () => string): void { const tx = new TransactionImpl(fn, getDebugName); try { - getLogger()?.handleBeginTransaction(tx); fn(tx); } finally { tx.finish(); - getLogger()?.handleEndTransaction(); } } @@ -212,13 +225,15 @@ export function subtransaction(tx: ITransaction | undefined, fn: (tx: ITransacti export class TransactionImpl implements ITransaction { private updatingObservers: { observer: IObserver; observable: IObservable }[] | null = []; - constructor(private readonly fn: Function, private readonly _getDebugName?: () => string) { } + constructor(public readonly _fn: Function, private readonly _getDebugName?: () => string) { + getLogger()?.handleBeginTransaction(this); + } public getDebugName(): string | undefined { if (this._getDebugName) { return this._getDebugName(); } - return getFunctionName(this.fn); + return getFunctionName(this._fn); } public updateObserver(observer: IObserver, observable: IObservable): void { @@ -233,6 +248,7 @@ export class TransactionImpl implements ITransaction { for (const { observer, observable } of updatingObservers) { observer.endUpdate(observable); } + getLogger()?.handleEndTransaction(); } } @@ -248,6 +264,10 @@ export function getFunctionName(fn: Function): string | undefined { export interface ISettableObservable extends IObservable, ISettable { } +/** + * Creates an observable value. + * Observers get informed when the value changes. + */ export function observableValue(name: string, initialValue: T): ISettableObservable { return new ObservableValue(name, initialValue); } @@ -278,7 +298,7 @@ export class ObservableValue try { const oldValue = this._value; this._setValue(value); - getLogger()?.handleObservableChanged(this, { oldValue, newValue: value, change, didChange: true }); + getLogger()?.handleObservableChanged(this, { oldValue, newValue: value, change, didChange: true, hadValue: true }); for (const observer of this.observers) { tx.updateObserver(observer, this); diff --git a/src/vs/base/common/observableImpl/derived.ts b/src/vs/base/common/observableInternal/derived.ts similarity index 68% rename from src/vs/base/common/observableImpl/derived.ts rename to src/vs/base/common/observableInternal/derived.ts index 29df8e0154f..2cb17f2f9da 100644 --- a/src/vs/base/common/observableImpl/derived.ts +++ b/src/vs/base/common/observableInternal/derived.ts @@ -4,11 +4,19 @@ *--------------------------------------------------------------------------------------------*/ import { BugIndicatingError } from 'vs/base/common/errors'; -import { IReader, IObservable, BaseObservable, IObserver, _setDerived, IChangeContext } from 'vs/base/common/observableImpl/base'; -import { getLogger } from 'vs/base/common/observableImpl/logging'; +import { DisposableStore } from 'vs/base/common/lifecycle'; +import { IReader, IObservable, BaseObservable, IObserver, _setDerived, IChangeContext, getFunctionName } from 'vs/base/common/observableInternal/base'; +import { getLogger } from 'vs/base/common/observableInternal/logging'; -export function derived(debugName: string | (() => string), computeFn: (reader: IReader) => T): IObservable { - return new Derived(debugName, computeFn, undefined, undefined); +export type EqualityComparer = (a: T, b: T) => boolean; +const defaultEqualityComparer: EqualityComparer = (a, b) => a === b; + +export function derived(computeFn: (reader: IReader) => T, debugName?: string | (() => string)): IObservable { + return new Derived(debugName, computeFn, undefined, undefined, undefined, defaultEqualityComparer); +} + +export function derivedOpts(options: { debugName?: string | (() => string); equalityComparer?: EqualityComparer }, computeFn: (reader: IReader) => T): IObservable { + return new Derived(options.debugName, computeFn, undefined, undefined, undefined, options.equalityComparer ?? defaultEqualityComparer); } export function derivedHandleChanges( @@ -18,7 +26,15 @@ export function derivedHandleChanges( handleChange: (context: IChangeContext, changeSummary: TChangeSummary) => boolean; }, computeFn: (reader: IReader, changeSummary: TChangeSummary) => T): IObservable { - return new Derived(debugName, computeFn, options.createEmptyChangeSummary, options.handleChange); + return new Derived(debugName, computeFn, options.createEmptyChangeSummary, options.handleChange, undefined, defaultEqualityComparer); +} + +export function derivedWithStore(name: string, computeFn: (reader: IReader, store: DisposableStore) => T): IObservable { + const store = new DisposableStore(); + return new Derived(name, r => { + store.clear(); + return computeFn(r, store); + }, undefined, undefined, () => store.dispose(), defaultEqualityComparer); } _setDerived(derived); @@ -54,14 +70,19 @@ export class Derived extends BaseObservable im private changeSummary: TChangeSummary | undefined = undefined; public override get debugName(): string { + if (!this._debugName) { + return getFunctionName(this._computeFn) || '(anonymous)'; + } return typeof this._debugName === 'function' ? this._debugName() : this._debugName; } constructor( - private readonly _debugName: string | (() => string), - private readonly computeFn: (reader: IReader, changeSummary: TChangeSummary) => T, + private readonly _debugName: string | (() => string) | undefined, + public readonly _computeFn: (reader: IReader, changeSummary: TChangeSummary) => T, private readonly createChangeSummary: (() => TChangeSummary) | undefined, private readonly _handleChange: ((context: IChangeContext, summary: TChangeSummary) => boolean) | undefined, + private readonly _handleLastObserverRemoved: (() => void) | undefined = undefined, + private readonly _equalityComparator: EqualityComparer, ) { super(); this.changeSummary = this.createChangeSummary?.(); @@ -79,25 +100,25 @@ export class Derived extends BaseObservable im d.removeObserver(this); } this.dependencies.clear(); + + this._handleLastObserverRemoved?.(); } public override get(): T { if (this.observers.size === 0) { // Without observers, we don't know when to clean up stuff. // Thus, we don't cache anything to prevent memory leaks. - const result = this.computeFn(this, this.createChangeSummary?.()!); + const result = this._computeFn(this, this.createChangeSummary?.()!); // Clear new dependencies this.onLastObserverRemoved(); return result; } else { do { + // We might not get a notification for a dependency that changed while it is updating, + // thus we also have to ask all our depedencies if they changed in this case. if (this.state === DerivedState.dependenciesMightHaveChanged) { - // We might not get a notification for a dependency that changed while it is updating, - // thus we also have to ask all our depedencies if they changed in this case. - this.state = DerivedState.upToDate; - for (const d of this.dependencies) { - /** might call {@link handleChange} indirectly, which could invalidate us */ + /** might call {@link handleChange} indirectly, which could make us stale */ d.reportChanges(); if (this.state as DerivedState === DerivedState.stale) { @@ -107,6 +128,12 @@ export class Derived extends BaseObservable im } } + // We called report changes of all dependencies. + // If we are still not stale, we can assume to be up to date again. + if (this.state === DerivedState.dependenciesMightHaveChanged) { + this.state = DerivedState.upToDate; + } + this._recomputeIfNeeded(); // In case recomputation changed one of our dependencies, we need to recompute again. } while (this.state !== DerivedState.upToDate); @@ -130,7 +157,7 @@ export class Derived extends BaseObservable im this.changeSummary = this.createChangeSummary?.(); try { /** might call {@link handleChange} indirectly, which could invalidate us */ - this.value = this.computeFn(this, changeSummary); + this.value = this._computeFn(this, changeSummary); } finally { // We don't want our observed observables to think that they are (not even temporarily) not being observed. // Thus, we only unsubscribe from observables that are definitely not read anymore. @@ -140,13 +167,14 @@ export class Derived extends BaseObservable im this.dependenciesToBeRemoved.clear(); } - const didChange = hadValue && oldValue !== this.value; + const didChange = hadValue && !(this._equalityComparator(oldValue!, this.value)); getLogger()?.handleDerivedRecomputed(this, { oldValue, newValue: this.value, change: undefined, - didChange + didChange, + hadValue, }); if (didChange) { @@ -196,7 +224,7 @@ export class Derived extends BaseObservable im public handlePossibleChange(observable: IObservable): void { // In all other states, observers already know that we might have changed. - if (this.state === DerivedState.upToDate && this.dependencies.has(observable)) { + if (this.state === DerivedState.upToDate && this.dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) { this.state = DerivedState.dependenciesMightHaveChanged; for (const r of this.observers) { r.handlePossibleChange(this); @@ -205,22 +233,19 @@ export class Derived extends BaseObservable im } public handleChange(observable: IObservable, change: TChange): void { - const isUpToDate = this.state === DerivedState.upToDate; - let shouldReact = true; - - if (this._handleChange && this.dependencies.has(observable)) { - shouldReact = this._handleChange({ + if (this.dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) { + const shouldReact = this._handleChange ? this._handleChange({ changedObservable: observable, change, didChange: o => o === observable as any, - }, this.changeSummary!); - } - - if (shouldReact && (this.state === DerivedState.dependenciesMightHaveChanged || isUpToDate) && this.dependencies.has(observable)) { - this.state = DerivedState.stale; - if (isUpToDate) { - for (const r of this.observers) { - r.handlePossibleChange(this); + }, this.changeSummary!) : true; + const wasUpToDate = this.state === DerivedState.upToDate; + if (shouldReact && (this.state === DerivedState.dependenciesMightHaveChanged || wasUpToDate)) { + this.state = DerivedState.stale; + if (wasUpToDate) { + for (const r of this.observers) { + r.handlePossibleChange(this); + } } } } @@ -239,16 +264,21 @@ export class Derived extends BaseObservable im } public override addObserver(observer: IObserver): void { - if (!this.observers.has(observer) && this.updateCount > 0) { + const shouldCallBeginUpdate = !this.observers.has(observer) && this.updateCount > 0; + super.addObserver(observer); + + if (shouldCallBeginUpdate) { observer.beginUpdate(this); } - super.addObserver(observer); } public override removeObserver(observer: IObserver): void { - if (this.observers.has(observer) && this.updateCount > 0) { + const shouldCallEndUpdate = this.observers.has(observer) && this.updateCount > 0; + super.removeObserver(observer); + + if (shouldCallEndUpdate) { + // Calling end update after removing the observer makes sure endUpdate cannot be called twice here. observer.endUpdate(this); } - super.removeObserver(observer); } } diff --git a/src/vs/base/common/observableImpl/logging.ts b/src/vs/base/common/observableInternal/logging.ts similarity index 85% rename from src/vs/base/common/observableImpl/logging.ts rename to src/vs/base/common/observableInternal/logging.ts index 0c221d0c700..01fcc3cdbbf 100644 --- a/src/vs/base/common/observableImpl/logging.ts +++ b/src/vs/base/common/observableInternal/logging.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AutorunObserver } from 'vs/base/common/observableImpl/autorun'; -import { IObservable, ObservableValue, TransactionImpl } from 'vs/base/common/observableImpl/base'; -import { Derived } from 'vs/base/common/observableImpl/derived'; -import { FromEventObservable } from 'vs/base/common/observableImpl/utils'; +import { AutorunObserver } from 'vs/base/common/observableInternal/autorun'; +import { IObservable, ObservableValue, TransactionImpl } from 'vs/base/common/observableInternal/base'; +import { Derived } from 'vs/base/common/observableInternal/derived'; +import { FromEventObservable } from 'vs/base/common/observableInternal/utils'; let globalObservableLogger: IObservableLogger | undefined; @@ -23,17 +23,19 @@ interface IChangeInformation { newValue: unknown; change: unknown; didChange: boolean; + hadValue: boolean; } export interface IObservableLogger { - handleObservableChanged(observable: ObservableValue, info: IChangeInformation): void; + handleObservableChanged(observable: ObservableValue, info: IChangeInformation): void; handleFromEventObservableTriggered(observable: FromEventObservable, info: IChangeInformation): void; handleAutorunCreated(autorun: AutorunObserver): void; handleAutorunTriggered(autorun: AutorunObserver): void; + handleAutorunFinished(autorun: AutorunObserver): void; - handleDerivedCreated(observable: Derived): void; - handleDerivedRecomputed(observable: Derived, info: IChangeInformation): void; + handleDerivedCreated(observable: Derived): void; + handleDerivedRecomputed(observable: Derived, info: IChangeInformation): void; handleBeginTransaction(transaction: TransactionImpl): void; handleEndTransaction(): void; @@ -50,6 +52,15 @@ export class ConsoleObservableLogger implements IObservableLogger { } private formatInfo(info: IChangeInformation): ConsoleText[] { + if (!info.hadValue) { + return [ + normalText(` `), + styled(formatValue(info.newValue, 60), { + color: 'green', + }), + normalText(` (initial)`), + ]; + } return info.didChange ? [ normalText(` `), @@ -102,7 +113,8 @@ export class ConsoleObservableLogger implements IObservableLogger { formatKind('derived recomputed'), styled(derived.debugName, { color: 'BlueViolet' }), ...this.formatInfo(info), - this.formatChanges(changedObservables) + this.formatChanges(changedObservables), + { data: [{ fn: derived._computeFn }] } ])); changedObservables.clear(); } @@ -112,6 +124,7 @@ export class ConsoleObservableLogger implements IObservableLogger { formatKind('observable from event triggered'), styled(observable.debugName, { color: 'BlueViolet' }), ...this.formatInfo(info), + { data: [{ fn: observable._getValue }] } ])); } @@ -129,9 +142,15 @@ export class ConsoleObservableLogger implements IObservableLogger { console.log(...this.textToConsoleArgs([ formatKind('autorun'), styled(autorun.debugName, { color: 'BlueViolet' }), - this.formatChanges(changedObservables) + this.formatChanges(changedObservables), + { data: [{ fn: autorun._runFn }] } ])); changedObservables.clear(); + this.indentation++; + } + + handleAutorunFinished(autorun: AutorunObserver): void { + this.indentation--; } handleBeginTransaction(transaction: TransactionImpl): void { @@ -142,6 +161,7 @@ export class ConsoleObservableLogger implements IObservableLogger { console.log(...this.textToConsoleArgs([ formatKind('transaction'), styled(transactionName, { color: 'BlueViolet' }), + { data: [{ fn: transaction._fn }] } ])); this.indentation++; } @@ -153,13 +173,12 @@ export class ConsoleObservableLogger implements IObservableLogger { type ConsoleText = | (ConsoleText | undefined)[] - | { text: string; style: string; data?: Record } - | { data: Record }; + | { text: string; style: string; data?: unknown[] } + | { data: unknown[] }; function consoleTextToArgs(text: ConsoleText): unknown[] { const styles = new Array(); - const initial = {}; - const data = initial; + const data: unknown[] = []; let firstArg = ''; function process(t: ConsoleText): void { @@ -173,20 +192,17 @@ function consoleTextToArgs(text: ConsoleText): unknown[] { firstArg += `%c${t.text}`; styles.push(t.style); if (t.data) { - Object.assign(data, t.data); + data.push(...t.data); } } else if ('data' in t) { - Object.assign(data, t.data); + data.push(...t.data); } } process(text); const result = [firstArg, ...styles]; - if (Object.keys(data).length > 0) { - result.push(data); - } - + result.push(...data); return result; } diff --git a/src/vs/base/common/observableImpl/utils.ts b/src/vs/base/common/observableInternal/utils.ts similarity index 86% rename from src/vs/base/common/observableImpl/utils.ts rename to src/vs/base/common/observableInternal/utils.ts index 093f78773ec..c0e0adba010 100644 --- a/src/vs/base/common/observableImpl/utils.ts +++ b/src/vs/base/common/observableInternal/utils.ts @@ -3,13 +3,16 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; -import { autorun } from 'vs/base/common/observableImpl/autorun'; -import { IObservable, BaseObservable, transaction, IReader, ITransaction, ConvenientObservable, IObserver, observableValue, getFunctionName } from 'vs/base/common/observableImpl/base'; -import { derived } from 'vs/base/common/observableImpl/derived'; import { Event } from 'vs/base/common/event'; -import { getLogger } from 'vs/base/common/observableImpl/logging'; +import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; +import { autorun } from 'vs/base/common/observableInternal/autorun'; +import { BaseObservable, ConvenientObservable, IObservable, IObserver, IReader, ITransaction, getFunctionName, observableValue, transaction } from 'vs/base/common/observableInternal/base'; +import { derived } from 'vs/base/common/observableInternal/derived'; +import { getLogger } from 'vs/base/common/observableInternal/logging'; +/** + * Represents an efficient observable whose value never changes. + */ export function constObservable(value: T): IObservable { return new ConstObservable(value); } @@ -53,7 +56,8 @@ export function waitForState(observable: IObservable, predicate: (state: T return new Promise(resolve => { let didRun = false; let shouldDispose = false; - const d = autorun('waitForState', reader => { + const d = autorun(reader => { + /** @description waitForState */ const currentState = observable.read(reader); if (predicate(currentState)) { if (!didRun) { @@ -85,13 +89,13 @@ export class FromEventObservable extends BaseObservable { constructor( private readonly event: Event, - private readonly getValue: (args: TArgs | undefined) => T + public readonly _getValue: (args: TArgs | undefined) => T ) { super(); } private getDebugName(): string | undefined { - return getFunctionName(this.getValue); + return getFunctionName(this._getValue); } public get debugName(): string { @@ -104,11 +108,11 @@ export class FromEventObservable extends BaseObservable { } private readonly handleEvent = (args: TArgs | undefined) => { - const newValue = this.getValue(args); + const newValue = this._getValue(args); const didChange = !this.hasValue || this.value !== newValue; - getLogger()?.handleFromEventObservableTriggered(this, { oldValue: this.value, newValue, change: undefined, didChange }); + getLogger()?.handleFromEventObservableTriggered(this, { oldValue: this.value, newValue, change: undefined, didChange, hadValue: this.hasValue }); if (didChange) { this.value = newValue; @@ -146,7 +150,7 @@ export class FromEventObservable extends BaseObservable { return this.value!; } else { // no cache, as there are no subscribers to keep it updated - return this.getValue(undefined); + return this._getValue(undefined); } } } @@ -198,6 +202,11 @@ class FromEventObservableSignal extends BaseObservable { } } +/** + * Creates a signal that can be triggered to invalidate observers. + * Signals don't have a value - when they are triggered they indicate a change. + * However, signals can carry a delta that is passed to observers. + */ export function observableSignal( debugName: string ): IObservableSignal { @@ -239,7 +248,8 @@ export function debouncedObservable(observable: IObservable, debounceMs: n let timeout: any = undefined; - disposableStore.add(autorun('debounce', reader => { + disposableStore.add(autorun(reader => { + /** @description debounce */ const value = observable.read(reader); if (timeout) { @@ -275,6 +285,7 @@ export function wasEventTriggeredRecently(event: Event, timeoutMs: number, return observable; } +// TODO@hediet: Have `keepCacheAlive` and `recomputeOnChange` instead of forceRecompute /** * This ensures the observable is being observed. * Observed observables (such as {@link derived}s) can maintain a cache, as they receive invalidation events. @@ -287,6 +298,10 @@ export function wasEventTriggeredRecently(event: Event, timeoutMs: number, export function keepAlive(observable: IObservable, forceRecompute?: boolean): IDisposable { const o = new KeepAliveObserver(forceRecompute ?? false); observable.addObserver(o); + if (forceRecompute) { + observable.reportChanges(); + } + return toDisposable(() => { observable.removeObserver(o); }); @@ -319,21 +334,21 @@ class KeepAliveObserver implements IObserver { export function derivedObservableWithCache(name: string, computeFn: (reader: IReader, lastValue: T | undefined) => T): IObservable { let lastValue: T | undefined = undefined; - const observable = derived(name, reader => { + const observable = derived(reader => { lastValue = computeFn(reader, lastValue); return lastValue; - }); + }, name); return observable; } export function derivedObservableWithWritableCache(name: string, computeFn: (reader: IReader, lastValue: T | undefined) => T): IObservable & { clearCache(transaction: ITransaction): void } { let lastValue: T | undefined = undefined; const counter = observableValue('derivedObservableWithWritableCache.counter', 0); - const observable = derived(name, reader => { + const observable = derived(reader => { counter.read(reader); lastValue = computeFn(reader, lastValue); return lastValue; - }); + }, name); return Object.assign(observable, { clearCache: (transaction: ITransaction) => { lastValue = undefined; diff --git a/src/vs/base/common/prefixTree.ts b/src/vs/base/common/prefixTree.ts new file mode 100644 index 00000000000..20ef79000e2 --- /dev/null +++ b/src/vs/base/common/prefixTree.ts @@ -0,0 +1,168 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +const unset = Symbol('unset'); + +/** + * A simple prefix tree implementation where a value is stored based on + * well-defined prefix segments. + */ +export class WellDefinedPrefixTree { + private readonly root = new Node(); + private _size = 0; + + public get size() { + return this._size; + } + + /** Inserts a new value in the prefix tree. */ + insert(key: Iterable, value: V): void { + this.opNode(key, n => n.value = value); + } + + /** Mutates a value in the prefix tree. */ + mutate(key: Iterable, mutate: (value?: V) => V): void { + this.opNode(key, n => n.value = mutate(n.value === unset ? undefined : n.value)); + } + + /** Deletes a node from the prefix tree, returning the value it contained. */ + delete(key: Iterable): V | undefined { + const path = [{ part: '', node: this.root }]; + let i = 0; + for (const part of key) { + const node = path[i].node.children?.get(part); + if (!node) { + return undefined; // node not in tree + } + + path.push({ part, node }); + i++; + } + + const value = path[i].node.value; + if (value === unset) { + return; // not actually a real node + } + + this._size--; + for (; i > 0; i--) { + const parent = path[i - 1]; + parent.node.children!.delete(path[i].part); + if (parent.node.children!.size > 0 || parent.node.value !== unset) { + break; + } + } + + return value; + } + + /** Gets a value from the tree. */ + find(key: Iterable): V | undefined { + let node = this.root; + for (const segment of key) { + const next = node.children?.get(segment); + if (!next) { + return undefined; + } + + node = next; + } + + return node.value === unset ? undefined : node.value; + } + + /** Gets whether the tree has the key, or a parent of the key, already inserted. */ + hasKeyOrParent(key: Iterable): boolean { + let node = this.root; + for (const segment of key) { + const next = node.children?.get(segment); + if (!next) { + return false; + } + if (next.value !== unset) { + return true; + } + + node = next; + } + + return false; + } + + /** Gets whether the tree has the given key or any children. */ + hasKeyOrChildren(key: Iterable): boolean { + let node = this.root; + for (const segment of key) { + const next = node.children?.get(segment); + if (!next) { + return false; + } + + node = next; + } + + return true; + } + + /** Gets whether the tree has the given key. */ + hasKey(key: Iterable): boolean { + let node = this.root; + for (const segment of key) { + const next = node.children?.get(segment); + if (!next) { + return false; + } + + node = next; + } + + return node.value !== unset; + } + + private opNode(key: Iterable, fn: (node: Node) => void): void { + let node = this.root; + for (const part of key) { + if (!node.children) { + const next = new Node(); + node.children = new Map([[part, next]]); + node = next; + } else if (!node.children.has(part)) { + const next = new Node(); + node.children.set(part, next); + node = next; + } else { + node = node.children.get(part)!; + } + } + + if (node.value === unset) { + this._size++; + } + + fn(node); + } + + /** Returns an iterable of the tree values in no defined order. */ + *values() { + const stack = [this.root]; + while (stack.length > 0) { + const node = stack.pop()!; + if (node.value !== unset) { + yield node.value; + } + + if (node.children) { + for (const child of node.children.values()) { + stack.push(child); + } + } + } + } +} + +class Node { + public children?: Map>; + public value: T | typeof unset = unset; +} diff --git a/src/vs/base/common/process.ts b/src/vs/base/common/process.ts index cfa3c1c5a41..a50f849b5af 100644 --- a/src/vs/base/common/process.ts +++ b/src/vs/base/common/process.ts @@ -48,6 +48,8 @@ else { * environments. * * Note: in web, this property is hardcoded to be `/`. + * + * @skipMangle */ export const cwd = safeProcess.cwd; diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts index 264ebef4f3c..47b2de558c4 100644 --- a/src/vs/base/common/product.ts +++ b/src/vs/base/common/product.ts @@ -92,8 +92,6 @@ export interface IProductConfiguration { assignmentContextTelemetryPropertyName: string; }; - readonly experimentsUrl?: string; - readonly extensionsGallery?: { readonly serviceUrl: string; readonly servicePPEUrl?: string; @@ -132,11 +130,6 @@ export interface IProductConfiguration { readonly ariaKey: string; }; - readonly sendASmile?: { - readonly reportIssueUrl: string; - readonly requestFeatureUrl: string; - }; - readonly documentationUrl?: string; readonly serverDocumentationUrl?: string; readonly releaseNotesUrl?: string; @@ -146,7 +139,7 @@ export interface IProductConfiguration { readonly introductoryVideosUrl?: string; readonly tipsAndTricksUrl?: string; readonly newsletterSignupUrl?: string; - readonly twitterUrl?: string; + readonly youTubeUrl?: string; readonly requestFeatureUrl?: string; readonly reportIssueUrl?: string; readonly reportMarketplaceIssueUrl?: string; @@ -191,6 +184,8 @@ export interface IProductConfiguration { readonly 'editSessions.store'?: Omit; readonly darwinUniversalAssetId?: string; readonly profileTemplatesUrl?: string; + + readonly commonlyUsedSettings?: string[]; } export interface ITunnelApplicationConfig { @@ -201,6 +196,11 @@ export interface ITunnelApplicationConfig { export interface IExtensionRecommendations { readonly onFileOpen: IFileOpenCondition[]; + readonly onSettingsEditorOpen?: ISettingsEditorOpenCondition; +} + +export interface ISettingsEditorOpenCondition { + readonly prerelease: boolean | string; } export interface IExtensionRecommendationCondition { diff --git a/src/vs/base/common/stopwatch.ts b/src/vs/base/common/stopwatch.ts index f38627afedb..e32c0dd9d91 100644 --- a/src/vs/base/common/stopwatch.ts +++ b/src/vs/base/common/stopwatch.ts @@ -3,22 +3,24 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { globals } from 'vs/base/common/platform'; +// fake definition so that the valid layers check won't trip on this +declare const globalThis: { performance?: { now(): number } }; -const hasPerformanceNow = (globals.performance && typeof globals.performance.now === 'function'); +const hasPerformanceNow = (globalThis.performance && typeof globalThis.performance.now === 'function'); export class StopWatch { - private _highResolution: boolean; private _startTime: number; private _stopTime: number; - public static create(highResolution: boolean = true): StopWatch { + private readonly _now: () => number; + + public static create(highResolution?: boolean): StopWatch { return new StopWatch(highResolution); } - constructor(highResolution: boolean) { - this._highResolution = hasPerformanceNow && highResolution; + constructor(highResolution?: boolean) { + this._now = hasPerformanceNow && highResolution === false ? Date.now : globalThis.performance!.now.bind(globalThis.performance); this._startTime = this._now(); this._stopTime = -1; } @@ -38,8 +40,4 @@ export class StopWatch { } return this._now() - this._startTime; } - - private _now(): number { - return this._highResolution ? globals.performance.now() : Date.now(); - } } diff --git a/src/vs/base/common/stripComments.d.ts b/src/vs/base/common/stripComments.d.ts index 69e662e9759..af5b182b5bf 100644 --- a/src/vs/base/common/stripComments.d.ts +++ b/src/vs/base/common/stripComments.d.ts @@ -10,5 +10,5 @@ * supported in JSON. * @param content the content to strip comments from * @returns the content without comments - */ +*/ export function stripComments(content: string): string; diff --git a/src/vs/base/common/types.ts b/src/vs/base/common/types.ts index c35da047d1f..c66ad018097 100644 --- a/src/vs/base/common/types.ts +++ b/src/vs/base/common/types.ts @@ -225,6 +225,10 @@ export type AddFirstParameterToFunctions }> = Partial & U[keyof U]; +/** + * Only picks the non-optional properties of a type. + */ +export type OmitOptional = { [K in keyof T as T[K] extends Required[K] ? K : never]: T[K] }; /** * A type that removed readonly-less from all properties of `T` diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts index deefcb96396..924dbf3ad7d 100644 --- a/src/vs/base/common/worker/simpleWorker.ts +++ b/src/vs/base/common/worker/simpleWorker.ts @@ -558,6 +558,7 @@ export class SimpleWorkerServer { /** * Called on the worker side + * @skipMangle */ export function create(postMessage: (msg: Message, transfer?: ArrayBuffer[]) => void): SimpleWorkerServer { return new SimpleWorkerServer(postMessage, null); diff --git a/src/vs/base/node/nodeStreams.ts b/src/vs/base/node/nodeStreams.ts new file mode 100644 index 00000000000..0719bb46787 --- /dev/null +++ b/src/vs/base/node/nodeStreams.ts @@ -0,0 +1,62 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +import { Transform } from 'stream'; +import { binaryIndexOf } from 'vs/base/common/buffer'; + +/** + * A Transform stream that splits the input on the "splitter" substring. + * The resulting chunks will contain (and trail with) the splitter match. + * The last chunk when the stream ends will be emitted even if a splitter + * is not encountered. + */ +export class StreamSplitter extends Transform { + private buffer: Buffer | undefined; + private readonly splitter: Buffer | number; + private readonly spitterLen: number; + + constructor(splitter: string | number | Buffer) { + super(); + if (typeof splitter === 'number') { + this.splitter = splitter; + this.spitterLen = 1; + } else { + const buf = Buffer.isBuffer(splitter) ? splitter : Buffer.from(splitter); + this.splitter = buf.length === 1 ? buf[0] : buf; + this.spitterLen = buf.length; + } + } + + override _transform(chunk: Buffer, _encoding: string, callback: (error?: Error | null, data?: any) => void): void { + if (!this.buffer) { + this.buffer = chunk; + } else { + this.buffer = Buffer.concat([this.buffer, chunk]); + } + + let offset = 0; + while (offset < this.buffer.length) { + const index = typeof this.splitter === 'number' + ? this.buffer.indexOf(this.splitter, offset) + : binaryIndexOf(this.buffer, this.splitter, offset); + if (index === -1) { + break; + } + + this.push(this.buffer.slice(offset, index + this.spitterLen)); + offset = index + this.spitterLen; + } + + this.buffer = offset === this.buffer.length ? undefined : this.buffer.slice(offset); + callback(); + } + + override _flush(callback: (error?: Error | null, data?: any) => void): void { + if (this.buffer) { + this.push(this.buffer); + } + + callback(); + } +} diff --git a/src/vs/base/node/osReleaseInfo.ts b/src/vs/base/node/osReleaseInfo.ts new file mode 100644 index 00000000000..f72b0fe82ba --- /dev/null +++ b/src/vs/base/node/osReleaseInfo.ts @@ -0,0 +1,73 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { constants as FSConstants } from 'fs'; +import { open, FileHandle } from 'fs/promises'; +import { createInterface as readLines } from 'readline'; +import * as Platform from 'vs/base/common/platform'; + +type ReleaseInfo = { + id: string; + id_like?: string; + version_id?: string; +}; + +export async function getOSReleaseInfo(errorLogger: (error: any) => void): Promise { + if (Platform.isMacintosh || Platform.isWindows) { + return; + } + + // Extract release information on linux based systems + // using the identifiers specified in + // https://www.freedesktop.org/software/systemd/man/os-release.html + let handle: FileHandle | undefined; + for (const filePath of ['/etc/os-release', '/usr/lib/os-release', '/etc/lsb-release']) { + try { + handle = await open(filePath, FSConstants.R_OK); + break; + } catch (err) { } + } + + if (!handle) { + errorLogger('Unable to retrieve release information from known identifier paths.'); + return; + } + + try { + const osReleaseKeys = new Set([ + 'ID', + 'DISTRIB_ID', + 'ID_LIKE', + 'VERSION_ID', + 'DISTRIB_RELEASE', + ]); + const releaseInfo: ReleaseInfo = { + id: 'unknown' + }; + + for await (const line of readLines({ input: handle.createReadStream(), crlfDelay: Infinity })) { + if (!line.includes('=')) { + continue; + } + const key = line.split('=')[0].toUpperCase().trim(); + if (osReleaseKeys.has(key)) { + const value = line.split('=')[1].replace(/"/g, '').toLowerCase().trim(); + if (key === 'ID' || key === 'DISTRIB_ID') { + releaseInfo.id = value; + } else if (key === 'ID_LIKE') { + releaseInfo.id_like = value; + } else if (key === 'VERSION_ID' || key === 'DISTRIB_RELEASE') { + releaseInfo.version_id = value; + } + } + } + + return releaseInfo; + } catch (err) { + errorLogger(err); + } + + return; +} diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts index 28e6ca7e887..9e409829cae 100644 --- a/src/vs/base/node/pfs.ts +++ b/src/vs/base/node/pfs.ts @@ -6,7 +6,7 @@ import * as fs from 'fs'; import { tmpdir } from 'os'; import { promisify } from 'util'; -import { ResourceQueue } from 'vs/base/common/async'; +import { ResourceQueue, timeout } from 'vs/base/common/async'; import { isEqualOrParent, isRootOrDriveLetter, randomPath } from 'vs/base/common/extpath'; import { normalizeNFC } from 'vs/base/common/normalization'; import { join } from 'vs/base/common/path'; @@ -37,8 +37,13 @@ export enum RimRafMode { * - `UNLINK`: direct removal from disk * - `MOVE`: faster variant that first moves the target to temp dir and then * deletes it in the background without waiting for that to finish. + * the optional `moveToPath` allows to override where to rename the + * path to before deleting it. */ -async function rimraf(path: string, mode = RimRafMode.UNLINK): Promise { +async function rimraf(path: string, mode: RimRafMode.UNLINK): Promise; +async function rimraf(path: string, mode: RimRafMode.MOVE, moveToPath?: string): Promise; +async function rimraf(path: string, mode?: RimRafMode, moveToPath?: string): Promise; +async function rimraf(path: string, mode = RimRafMode.UNLINK, moveToPath?: string): Promise { if (isRootOrDriveLetter(path)) { throw new Error('rimraf - will refuse to recursively delete root'); } @@ -49,12 +54,11 @@ async function rimraf(path: string, mode = RimRafMode.UNLINK): Promise { } // delete: via move - return rimrafMove(path); + return rimrafMove(path, moveToPath); } -async function rimrafMove(path: string): Promise { +async function rimrafMove(path: string, moveToPath = randomPath(tmpdir())): Promise { try { - const pathInTemp = randomPath(tmpdir()); try { // Intentionally using `fs.promises` here to skip // the patched graceful-fs method that can result @@ -64,7 +68,7 @@ async function rimrafMove(path: string): Promise { // than necessary and we have a fallback to delete // via unlink. // https://github.com/microsoft/vscode/issues/139908 - await fs.promises.rename(path, pathInTemp); + await fs.promises.rename(path, moveToPath); } catch (error) { if (error.code === 'ENOENT') { return; // ignore - path to delete did not exist @@ -74,7 +78,7 @@ async function rimrafMove(path: string): Promise { } // Delete but do not return as promise - rimrafUnlink(pathInTemp).catch(error => {/* ignore */ }); + rimrafUnlink(moveToPath).catch(error => {/* ignore */ }); } catch (error) { if (error.code !== 'ENOENT') { throw error; @@ -487,16 +491,24 @@ function ensureWriteOptions(options?: IWriteFileOptions): IEnsuredWriteFileOptio /** * A drop-in replacement for `fs.rename` that: * - allows to move across multiple disks + * - attempts to retry the operation for certain error codes on Windows */ -async function move(source: string, target: string): Promise { +async function rename(source: string, target: string, windowsRetryTimeout: number | false = 60000 /* matches graceful-fs */): Promise { if (source === target) { return; // simulate node.js behaviour here and do a no-op if paths match } try { - await Promises.rename(source, target); + if (isWindows && typeof windowsRetryTimeout === 'number') { + // On Windows, a rename can fail when either source or target + // is locked by AV software. We do leverage graceful-fs to iron + // out these issues, however in case the target file exists, + // graceful-fs will immediately return without retry for fs.rename(). + await renameWithRetry(source, target, Date.now(), windowsRetryTimeout); + } else { + await promisify(fs.rename)(source, target); + } } catch (error) { - // In two cases we fallback to classic copy and delete: // // 1.) The EXDEV error indicates that source and target are on different devices @@ -514,6 +526,44 @@ async function move(source: string, target: string): Promise { } } +async function renameWithRetry(source: string, target: string, startTime: number, retryTimeout: number, attempt = 0): Promise { + try { + return await promisify(fs.rename)(source, target); + } catch (error) { + if (error.code !== 'EACCES' && error.code !== 'EPERM' && error.code !== 'EBUSY') { + throw error; // only for errors we think are temporary + } + + if (Date.now() - startTime >= retryTimeout) { + console.error(`[node.js fs] rename failed after ${attempt} retries with error: ${error}`); + + throw error; // give up after configurable timeout + } + + if (attempt === 0) { + let abortRetry = false; + try { + const { stat } = await SymlinkSupport.stat(target); + if (!stat.isFile()) { + abortRetry = true; // if target is not a file, EPERM error may be raised and we should not attempt to retry + } + } catch (error) { + // Ignore + } + + if (abortRetry) { + throw error; + } + } + + // Delay with incremental backoff up to 100ms + await timeout(Math.min(100, attempt * 10)); + + // Attempt again + return renameWithRetry(source, target, startTime, retryTimeout, attempt + 1); + } +} + interface ICopyPayload { readonly root: { source: string; target: string }; readonly options: { preserveSymlinks: boolean }; @@ -690,7 +740,6 @@ export const Promises = new class { get fdatasync() { return promisify(fs.fdatasync); } get truncate() { return promisify(fs.truncate); } - get rename() { return promisify(fs.rename); } get copyFile() { return promisify(fs.copyFile); } get open() { return promisify(fs.open); } @@ -729,7 +778,7 @@ export const Promises = new class { get rm() { return rimraf; } - get move() { return move; } + get rename() { return rename; } get copy() { return copy; } //#endregion diff --git a/src/vs/base/node/ps.ts b/src/vs/base/node/ps.ts index fafa75bb8d4..f61af2b8117 100644 --- a/src/vs/base/node/ps.ts +++ b/src/vs/base/node/ps.ts @@ -51,8 +51,8 @@ export function listProcesses(rootPid: number): Promise { const UTILITY_NETWORK_HINT = /--utility-sub-type=network/i; const NODEJS_PROCESS_HINT = /--ms-enable-electron-run-as-node/i; const WINDOWS_CRASH_REPORTER = /--crashes-directory/i; - const WINDOWS_PTY = /\\pipe\\winpty-control/i; - const WINDOWS_CONSOLE_HOST = /conhost\.exe/i; + const WINPTY = /\\pipe\\winpty-control/i; + const CONPTY = /conhost\.exe.+--headless/i; const TYPE = /--type=([a-zA-Z-]+)/; // find windows crash reporter @@ -60,14 +60,14 @@ export function listProcesses(rootPid: number): Promise { return 'electron-crash-reporter'; } - // find windows pty process - if (WINDOWS_PTY.exec(cmd)) { - return 'winpty-process'; + // find winpty process + if (WINPTY.exec(cmd)) { + return 'winpty-agent'; } - // find windows console host process - if (WINDOWS_CONSOLE_HOST.exec(cmd)) { - return 'console-window-host (Windows internal process)'; + // find conpty process + if (CONPTY.exec(cmd)) { + return 'conpty-agent'; } // find "--type=xxxx" @@ -115,13 +115,13 @@ export function listProcesses(rootPid: number): Promise { const cleanUNCPrefix = (value: string): string => { if (value.indexOf('\\\\?\\') === 0) { - return value.substr(4); + return value.substring(4); } else if (value.indexOf('\\??\\') === 0) { - return value.substr(4); + return value.substring(4); } else if (value.indexOf('"\\\\?\\') === 0) { - return '"' + value.substr(5); + return '"' + value.substring(5); } else if (value.indexOf('"\\??\\') === 0) { - return '"' + value.substr(5); + return '"' + value.substring(5); } else { return value; } @@ -169,10 +169,7 @@ export function listProcesses(rootPid: number): Promise { reject(new Error(`Root process ${rootPid} not found`)); } }); - }, - // Workaround duplicate enum identifiers issue in @vscode/windows-process-tree - // Ref https://github.com/microsoft/vscode/pull/179508 - (windowsProcessTree.ProcessDataFlag as any).CommandLine | (windowsProcessTree.ProcessDataFlag as any).Memory); + }, windowsProcessTree.ProcessDataFlag.CommandLine | windowsProcessTree.ProcessDataFlag.Memory); }); } else { // OS X & Linux function calculateLinuxCpuUsage() { diff --git a/src/vs/base/node/unc.d.ts b/src/vs/base/node/unc.d.ts index 75e53310c8c..d131bba5d85 100644 --- a/src/vs/base/node/unc.d.ts +++ b/src/vs/base/node/unc.d.ts @@ -23,3 +23,8 @@ export function addUNCHostToAllowlist(allowedHost: string | string[]): void; * path validation. */ export function disableUNCAccessRestrictions(): void; + +/** + * Whether UNC Host allow list in node.js is disabled. + */ +export function isUNCAccessRestrictionsDisabled(): boolean; diff --git a/src/vs/base/node/unc.js b/src/vs/base/node/unc.js index 7a1c9e14ac6..b0af4d38b68 100644 --- a/src/vs/base/node/unc.js +++ b/src/vs/base/node/unc.js @@ -62,10 +62,10 @@ const allowlist = processUNCHostAllowlist(); if (allowlist) { if (typeof allowedHost === 'string') { - allowlist.add(allowedHost); + allowlist.add(allowedHost.toLowerCase()); // UNC hosts are case-insensitive } else { for (const host of toSafeStringArray(allowedHost)) { - allowlist.add(host); + addUNCHostToAllowlist(host); } } } @@ -114,14 +114,23 @@ return; } - process.enableUNCAccessChecks = false; + process.restrictUNCAccess = false; + } + + function isUNCAccessRestrictionsDisabled() { + if (process.platform !== 'win32') { + return true; + } + + return process.restrictUNCAccess === false; } return { getUNCHostAllowlist, addUNCHostToAllowlist, getUNCHost, - disableUNCAccessRestrictions + disableUNCAccessRestrictions, + isUNCAccessRestrictionsDisabled }; } diff --git a/src/vs/base/node/zip.ts b/src/vs/base/node/zip.ts index 171b9e45bbc..767d0a5aec6 100644 --- a/src/vs/base/node/zip.ts +++ b/src/vs/base/node/zip.ts @@ -36,7 +36,6 @@ export type ExtractErrorType = 'CorruptZip' | 'Incomplete'; export class ExtractError extends Error { readonly type?: ExtractErrorType; - readonly cause: Error; constructor(type: ExtractErrorType | undefined, cause: Error) { let message = cause.message; diff --git a/src/vs/base/parts/ipc/common/ipc.net.ts b/src/vs/base/parts/ipc/common/ipc.net.ts index 2ba8902448c..43363fba7ee 100644 --- a/src/vs/base/parts/ipc/common/ipc.net.ts +++ b/src/vs/base/parts/ipc/common/ipc.net.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IntervalTimer } from 'vs/base/common/async'; import { VSBuffer } from 'vs/base/common/buffer'; import { Emitter, Event } from 'vs/base/common/event'; import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle'; @@ -264,9 +263,7 @@ const enum ProtocolMessageType { ReplayRequest = 6, Pause = 7, Resume = 8, - KeepAlive = 9, - LatencyMeasurementRequest = 10, - LatencyMeasurementResponse = 11, + KeepAlive = 9 } function protocolMessageTypeToString(messageType: ProtocolMessageType) { @@ -280,8 +277,6 @@ function protocolMessageTypeToString(messageType: ProtocolMessageType) { case ProtocolMessageType.Pause: return 'PauseWriting'; case ProtocolMessageType.Resume: return 'ResumeWriting'; case ProtocolMessageType.KeepAlive: return 'KeepAlive'; - case ProtocolMessageType.LatencyMeasurementRequest: return 'LatencyMeasurementRequest'; - case ProtocolMessageType.LatencyMeasurementResponse: return 'LatencyMeasurementResponse'; } } @@ -309,22 +304,6 @@ export const enum ProtocolConstants { * Send a message every 5 seconds to avoid that the connection is closed by the OS. */ KeepAliveSendTime = 5000, // 5 seconds - /** - * Measure the latency every 1 minute. - */ - LatencySampleTime = 1 * 60 * 1000, // 1 minute - /** - * Keep the last 5 samples for latency measurement. - */ - LatencySampleCount = 5, - /** - * A latency over 1s will be considered high. - */ - HighLatencyTimeThreshold = 1000, - /** - * Having 3 or more samples with high latency will trigger a high latency event. - */ - HighLatencySampleThreshold = 3, } class ProtocolMessage { @@ -803,52 +782,6 @@ export interface ILoadEstimator { hasHighLoad(): boolean; } -export const enum ConnectionHealth { - /** - * The connection health is considered good when a certain number of recent round trip time measurements are below a certain threshold. - * @see ProtocolConstants.HighLatencyTimeThreshold @see ProtocolConstants.HighLatencySampleThreshold - */ - Good, - /** - * The connection health is considered poor when a certain number of recent round trip time measurements are above a certain threshold. - * @see ProtocolConstants.HighLatencyTimeThreshold @see ProtocolConstants.HighLatencySampleThreshold - */ - Poor -} - -export function connectionHealthToString(connectionHealth: ConnectionHealth): 'good' | 'poor' { - switch (connectionHealth) { - case ConnectionHealth.Good: return 'good'; - case ConnectionHealth.Poor: return 'poor'; - } -} - -/** - * An event describing that the connection health has changed. - */ -export class ConnectionHealthChangedEvent { - constructor( - public readonly connectionHealth: ConnectionHealth - ) { } -} - -/** - * An event describing that a round trip time measurement was above a certain threshold. - */ -export class HighRoundTripTimeEvent { - constructor( - /** - * The round trip time in milliseconds. - */ - public readonly roundTripTime: number, - /** - * The number of recent round trip time measurements that were above the threshold. - * @see ProtocolConstants.HighLatencyTimeThreshold @see ProtocolConstants.HighLatencySampleThreshold - */ - public readonly recentHighRoundTripCount: number - ) { } -} - export interface PersistentProtocolOptions { /** * The socket to use. @@ -862,10 +795,6 @@ export interface PersistentProtocolOptions { * The CPU load estimator to use. */ loadEstimator?: ILoadEstimator; - /** - * Whether to measure round trip time. Defaults to false. - */ - measureRoundTripTime?: boolean; /** * Whether to send keep alive messages. Defaults to true. */ @@ -898,11 +827,9 @@ export class PersistentProtocol implements IMessagePassingProtocol { private _socket: ISocket; private _socketWriter: ProtocolWriter; private _socketReader: ProtocolReader; - private _socketLatencyMonitor: LatencyMonitor; private _socketDisposables: DisposableStore; private readonly _loadEstimator: ILoadEstimator; - private readonly _measureRoundTripTime: boolean; private readonly _shouldSendKeepAlive: boolean; private readonly _onControlMessage = new BufferedEmitter(); @@ -920,19 +847,12 @@ export class PersistentProtocol implements IMessagePassingProtocol { private readonly _onSocketTimeout = new BufferedEmitter(); readonly onSocketTimeout: Event = this._onSocketTimeout.event; - private readonly _onHighRoundTripTime = new BufferedEmitter(); - readonly onHighRoundTripTime = this._onHighRoundTripTime.event; - - private readonly _onDidChangeConnectionHealth = new BufferedEmitter(); - readonly onDidChangeConnectionHealth = this._onDidChangeConnectionHealth.event; - public get unacknowledgedCount(): number { return this._outgoingMsgId - this._outgoingAckId; } constructor(opts: PersistentProtocolOptions) { this._loadEstimator = opts.loadEstimator ?? LoadEstimator.getInstance(); - this._measureRoundTripTime = opts.measureRoundTripTime ?? false; this._shouldSendKeepAlive = opts.sendKeepAlive ?? true; this._isReconnecting = false; this._outgoingUnackMsg = new Queue(); @@ -954,13 +874,6 @@ export class PersistentProtocol implements IMessagePassingProtocol { this._socketReader = this._socketDisposables.add(new ProtocolReader(this._socket)); this._socketDisposables.add(this._socketReader.onMessage(msg => this._receiveMessage(msg))); this._socketDisposables.add(this._socket.onClose(e => this._onSocketClose.fire(e))); - this._socketLatencyMonitor = this._socketDisposables.add(new LatencyMonitor()); // is started immediately - this._socketDisposables.add(this._socketLatencyMonitor.onSendLatencyRequest(buffer => this._sendLatencyMeasurementRequest(buffer))); - this._socketDisposables.add(this._socketLatencyMonitor.onHighRoundTripTime(e => this._onHighRoundTripTime.fire(e))); - this._socketDisposables.add(this._socketLatencyMonitor.onDidChangeConnectionHealth(e => this._onDidChangeConnectionHealth.fire(e))); - if (this._measureRoundTripTime) { - this._socketLatencyMonitor.start(); - } if (opts.initialChunk) { this._socketReader.acceptChunk(opts.initialChunk); @@ -1041,19 +954,12 @@ export class PersistentProtocol implements IMessagePassingProtocol { this._socketReader = this._socketDisposables.add(new ProtocolReader(this._socket)); this._socketDisposables.add(this._socketReader.onMessage(msg => this._receiveMessage(msg))); this._socketDisposables.add(this._socket.onClose(e => this._onSocketClose.fire(e))); - this._socketLatencyMonitor = this._socketDisposables.add(new LatencyMonitor()); // will be started later - this._socketDisposables.add(this._socketLatencyMonitor.onSendLatencyRequest(buffer => this._sendLatencyMeasurementRequest(buffer))); - this._socketDisposables.add(this._socketLatencyMonitor.onHighRoundTripTime(e => this._onHighRoundTripTime.fire(e))); - this._socketDisposables.add(this._socketLatencyMonitor.onDidChangeConnectionHealth(e => this._onDidChangeConnectionHealth.fire(e))); this._socketReader.acceptChunk(initialDataChunk); } public endAcceptReconnection(): void { this._isReconnecting = false; - if (this._measureRoundTripTime) { - this._socketLatencyMonitor.start(); - } // After a reconnection, let the other party know (again) which messages have been received. // (perhaps the other party didn't receive a previous ACK) @@ -1144,15 +1050,6 @@ export class PersistentProtocol implements IMessagePassingProtocol { // nothing to do break; } - case ProtocolMessageType.LatencyMeasurementRequest: { - // we just send the data back - this._sendLatencyMeasurementResponse(msg.data); - break; - } - case ProtocolMessageType.LatencyMeasurementResponse: { - this._socketLatencyMonitor.handleResponse(msg.data); - break; - } } } @@ -1282,92 +1179,6 @@ export class PersistentProtocol implements IMessagePassingProtocol { const msg = new ProtocolMessage(ProtocolMessageType.KeepAlive, 0, this._incomingAckId, getEmptyBuffer()); this._socketWriter.write(msg); } - - private _sendLatencyMeasurementRequest(buffer: VSBuffer): void { - this._incomingAckId = this._incomingMsgId; - const msg = new ProtocolMessage(ProtocolMessageType.LatencyMeasurementRequest, 0, this._incomingAckId, buffer); - this._socketWriter.write(msg); - } - - private _sendLatencyMeasurementResponse(buffer: VSBuffer): void { - this._incomingAckId = this._incomingMsgId; - const msg = new ProtocolMessage(ProtocolMessageType.LatencyMeasurementResponse, 0, this._incomingAckId, buffer); - this._socketWriter.write(msg); - } -} - -class LatencyMonitor extends Disposable { - - private readonly _onSendLatencyRequest = this._register(new Emitter()); - readonly onSendLatencyRequest: Event = this._onSendLatencyRequest.event; - - private readonly _onHighRoundTripTime = this._register(new Emitter()); - public readonly onHighRoundTripTime = this._onHighRoundTripTime.event; - - private readonly _onDidChangeConnectionHealth = this._register(new Emitter()); - public readonly onDidChangeConnectionHealth = this._onDidChangeConnectionHealth.event; - - private readonly _measureLatencyTimer = this._register(new IntervalTimer()); - - /** - * Timestamp of our last latency request message sent to the other host. - */ - private _lastLatencyMeasurementSent: number = -1; - - /** - * ID separate from the regular message IDs. Used to match up latency - * requests with responses so we know we're timing the right message - * even if a reconnection occurs. - */ - private _lastLatencyMeasurementId: number = 0; - - /** - * Circular buffer of latency measurements - */ - private _latencySamples: number[] = Array.from({ length: ProtocolConstants.LatencySampleCount }, (_) => 0); - private _latencySampleIndex: number = 0; - private _connectionHealth = ConnectionHealth.Good; - - constructor() { - super(); - } - - public start(): void { - this._measureLatencyTimer.cancelAndSet(() => { - this._lastLatencyMeasurementSent = Date.now(); - const measurementId = ++this._lastLatencyMeasurementId; - const buffer = VSBuffer.alloc(4); - buffer.writeUInt32BE(measurementId, 0); - this._onSendLatencyRequest.fire(buffer); - }, ProtocolConstants.LatencySampleTime); - } - - public handleResponse(buffer: VSBuffer): void { - if (buffer.byteLength !== 4) { - // invalid measurementId - return; - } - const measurementId = buffer.readUInt32BE(0); - if (this._lastLatencyMeasurementSent <= 0 || measurementId !== this._lastLatencyMeasurementId) { - // invalid measurementId - return; - } - - const roundtripTime = Date.now() - this._lastLatencyMeasurementSent; - const sampleIndex = this._latencySampleIndex++; - this._latencySamples[sampleIndex % this._latencySamples.length] = roundtripTime; - - const previousConnectionHealth = this._connectionHealth; - const highLatencySampleCount = this._latencySamples.filter(s => s >= ProtocolConstants.HighLatencyTimeThreshold).length; - this._connectionHealth = (highLatencySampleCount >= ProtocolConstants.HighLatencySampleThreshold ? ConnectionHealth.Poor : ConnectionHealth.Good); - - if (roundtripTime > ProtocolConstants.HighLatencyTimeThreshold) { - this._onHighRoundTripTime.fire(new HighRoundTripTimeEvent(roundtripTime, highLatencySampleCount)); - } - if (previousConnectionHealth !== this._connectionHealth) { - this._onDidChangeConnectionHealth.fire(this._connectionHealth); - } - } } // (() => { diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts index d71baaeeeb5..747e8513b1f 100644 --- a/src/vs/base/parts/ipc/common/ipc.ts +++ b/src/vs/base/parts/ipc/common/ipc.ts @@ -8,7 +8,7 @@ import { CancelablePromise, createCancelablePromise, timeout } from 'vs/base/com import { VSBuffer } from 'vs/base/common/buffer'; import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; import { memoize } from 'vs/base/common/decorators'; -import { CancellationError } from 'vs/base/common/errors'; +import { CancellationError, ErrorNoTelemetry } from 'vs/base/common/errors'; import { Emitter, Event, EventMultiplexer, Relay } from 'vs/base/common/event'; import { combinedDisposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { revive } from 'vs/base/common/marshalling'; @@ -1102,7 +1102,7 @@ export namespace ProxyChannel { } } - throw new Error(`Event not found: ${event}`); + throw new ErrorNoTelemetry(`Event not found: ${event}`); } call(_: unknown, command: string, args?: any[]): Promise { @@ -1119,7 +1119,7 @@ export namespace ProxyChannel { return target.apply(handler, args); } - throw new Error(`Method not found: ${command}`); + throw new ErrorNoTelemetry(`Method not found: ${command}`); } }; } @@ -1185,7 +1185,7 @@ export namespace ProxyChannel { }; } - throw new Error(`Property not found: ${String(propKey)}`); + throw new ErrorNoTelemetry(`Property not found: ${String(propKey)}`); } }) as T; } diff --git a/src/vs/base/parts/storage/common/storage.ts b/src/vs/base/parts/storage/common/storage.ts index abf87917ad4..71bbf4f9741 100644 --- a/src/vs/base/parts/storage/common/storage.ts +++ b/src/vs/base/parts/storage/common/storage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ThrottledDelayer } from 'vs/base/common/async'; -import { Emitter, Event } from 'vs/base/common/event'; +import { Event, PauseableEmitter } from 'vs/base/common/event'; import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import { parse, stringify } from 'vs/base/common/marshalling'; import { isObject, isUndefinedOrNull } from 'vs/base/common/types'; @@ -52,9 +52,29 @@ export interface IStorageDatabase { close(recovery?: () => Map): Promise; } +export interface IStorageChangeEvent { + + /** + * The `key` of the storage entry that was changed + * or was removed. + */ + readonly key: string; + + /** + * A hint how the storage change event was triggered. If + * `true`, the storage change was triggered by an external + * source, such as: + * - another process (for example another window) + * - operations such as settings sync or profiles change + */ + readonly external?: boolean; +} + +export type StorageValue = string | boolean | number | undefined | null | object; + export interface IStorage extends IDisposable { - readonly onDidChangeStorage: Event; + readonly onDidChangeStorage: Event; readonly items: Map; readonly size: number; @@ -73,8 +93,8 @@ export interface IStorage extends IDisposable { getObject(key: string, fallbackValue: T): T; getObject(key: string, fallbackValue?: T): T | undefined; - set(key: string, value: string | boolean | number | undefined | null | object): Promise; - delete(key: string): Promise; + set(key: string, value: StorageValue, external?: boolean): Promise; + delete(key: string, external?: boolean): Promise; flush(delay?: number): Promise; whenFlushed(): Promise; @@ -92,7 +112,7 @@ export class Storage extends Disposable implements IStorage { private static readonly DEFAULT_FLUSH_DELAY = 100; - private readonly _onDidChangeStorage = this._register(new Emitter()); + private readonly _onDidChangeStorage = this._register(new PauseableEmitter()); readonly onDidChangeStorage = this._onDidChangeStorage.event; private state = StorageState.None; @@ -122,14 +142,22 @@ export class Storage extends Disposable implements IStorage { } private onDidChangeItemsExternal(e: IStorageItemsChangeEvent): void { - // items that change external require us to update our - // caches with the values. we just accept the value and - // emit an event if there is a change. - e.changed?.forEach((value, key) => this.accept(key, value)); - e.deleted?.forEach(key => this.accept(key, undefined)); + this._onDidChangeStorage.pause(); + + try { + // items that change external require us to update our + // caches with the values. we just accept the value and + // emit an event if there is a change. + + e.changed?.forEach((value, key) => this.acceptExternal(key, value)); + e.deleted?.forEach(key => this.acceptExternal(key, undefined)); + + } finally { + this._onDidChangeStorage.resume(); + } } - private accept(key: string, value: string | undefined): void { + private acceptExternal(key: string, value: string | undefined): void { if (this.state === StorageState.Closed) { return; // Return early if we are already closed } @@ -152,7 +180,7 @@ export class Storage extends Disposable implements IStorage { // Signal to outside listeners if (changed) { - this._onDidChangeStorage.fire(key); + this._onDidChangeStorage.fire({ key, external: true }); } } @@ -229,14 +257,14 @@ export class Storage extends Disposable implements IStorage { return parse(value); } - async set(key: string, value: string | boolean | number | null | undefined | object): Promise { + async set(key: string, value: string | boolean | number | null | undefined | object, external = false): Promise { if (this.state === StorageState.Closed) { return; // Return early if we are already closed } // We remove the key for undefined/null values if (isUndefinedOrNull(value)) { - return this.delete(key); + return this.delete(key, external); } // Otherwise, convert to String and store @@ -254,13 +282,13 @@ export class Storage extends Disposable implements IStorage { this.pendingDeletes.delete(key); // Event - this._onDidChangeStorage.fire(key); + this._onDidChangeStorage.fire({ key, external }); // Accumulate work by scheduling after timeout return this.doFlush(); } - async delete(key: string): Promise { + async delete(key: string, external = false): Promise { if (this.state === StorageState.Closed) { return; // Return early if we are already closed } @@ -278,7 +306,7 @@ export class Storage extends Disposable implements IStorage { this.pendingInserts.delete(key); // Event - this._onDidChangeStorage.fire(key); + this._onDidChangeStorage.fire({ key, external }); // Accumulate work by scheduling after timeout return this.doFlush(); diff --git a/src/vs/base/parts/storage/node/storage.ts b/src/vs/base/parts/storage/node/storage.ts index f4cf5ac78e1..e629ab01f0e 100644 --- a/src/vs/base/parts/storage/node/storage.ts +++ b/src/vs/base/parts/storage/node/storage.ts @@ -274,7 +274,7 @@ export class SQLiteStorageDatabase implements IStorageDatabase { try { await Promises.unlink(path); try { - await Promises.rename(this.toBackupPath(path), path); + await Promises.rename(this.toBackupPath(path), path, false /* no retry */); } catch (error) { // ignore } diff --git a/src/vs/base/parts/storage/test/node/storage.integrationTest.ts b/src/vs/base/parts/storage/test/node/storage.integrationTest.ts index bc329fabbb8..b0290ec7c60 100644 --- a/src/vs/base/parts/storage/test/node/storage.integrationTest.ts +++ b/src/vs/base/parts/storage/test/node/storage.integrationTest.ts @@ -59,8 +59,8 @@ flakySuite('Storage Library', function () { deepStrictEqual(storage.getObject('foo', { 'bar': 'baz' }), { 'bar': 'baz' }); let changes = new Set(); - storage.onDidChangeStorage(key => { - changes.add(key); + storage.onDidChangeStorage(e => { + changes.add(e.key); }); await storage.whenFlushed(); // returns immediately when no pending updates @@ -149,8 +149,8 @@ flakySuite('Storage Library', function () { const storage = new Storage(database); const changes = new Set(); - storage.onDidChangeStorage(key => { - changes.add(key); + storage.onDidChangeStorage(e => { + changes.add(e.key); }); await storage.init(); @@ -272,8 +272,8 @@ flakySuite('Storage Library', function () { await storage.init(); let changes = new Set(); - storage.onDidChangeStorage(key => { - changes.add(key); + storage.onDidChangeStorage(e => { + changes.add(e.key); }); const set1Promise = storage.set('foo', 'bar1'); diff --git a/src/vs/base/test/browser/dom.test.ts b/src/vs/base/test/browser/dom.test.ts index 87f5b2d4cab..dfb9f0a342b 100644 --- a/src/vs/base/test/browser/dom.test.ts +++ b/src/vs/base/test/browser/dom.test.ts @@ -18,6 +18,8 @@ suite('dom', () => { assert(!element.classList.contains('bar')); assert(!element.classList.contains('foo')); assert(!element.classList.contains('')); + + }); test('removeClass', () => { diff --git a/src/vs/base/test/browser/ui/list/rangeMap.test.ts b/src/vs/base/test/browser/ui/list/rangeMap.test.ts index 3b451445a63..518b250a943 100644 --- a/src/vs/base/test/browser/ui/list/rangeMap.test.ts +++ b/src/vs/base/test/browser/ui/list/rangeMap.test.ts @@ -343,3 +343,83 @@ suite('RangeMap', () => { }); }); }); + +suite('RangeMap with top padding', () => { + let rangeMap: RangeMap; + + setup(() => { + rangeMap = new RangeMap(10); + }); + + test('empty', () => { + assert.strictEqual(rangeMap.size, 10); + assert.strictEqual(rangeMap.count, 0); + }); + + const one = { size: 1 }; + const five = { size: 5 }; + const ten = { size: 10 }; + + test('length & count', () => { + rangeMap.splice(0, 0, [one]); + assert.strictEqual(rangeMap.size, 11); + assert.strictEqual(rangeMap.count, 1); + }); + + test('length & count #2', () => { + rangeMap.splice(0, 0, [one, one, one, one, one]); + assert.strictEqual(rangeMap.size, 15); + assert.strictEqual(rangeMap.count, 5); + }); + + test('length & count #3', () => { + rangeMap.splice(0, 0, [five]); + assert.strictEqual(rangeMap.size, 15); + assert.strictEqual(rangeMap.count, 1); + }); + + test('length & count #4', () => { + rangeMap.splice(0, 0, [five, five, five, five, five]); + assert.strictEqual(rangeMap.size, 35); + assert.strictEqual(rangeMap.count, 5); + }); + + test('insert', () => { + rangeMap.splice(0, 0, [five, five, five, five, five]); + assert.strictEqual(rangeMap.size, 35); + assert.strictEqual(rangeMap.count, 5); + + rangeMap.splice(0, 0, [five, five, five, five, five]); + assert.strictEqual(rangeMap.size, 60); + assert.strictEqual(rangeMap.count, 10); + + rangeMap.splice(5, 0, [ten, ten]); + assert.strictEqual(rangeMap.size, 80); + assert.strictEqual(rangeMap.count, 12); + + rangeMap.splice(12, 0, [{ size: 200 }]); + assert.strictEqual(rangeMap.size, 280); + assert.strictEqual(rangeMap.count, 13); + }); + + suite('indexAt, positionAt', () => { + test('empty', () => { + assert.strictEqual(rangeMap.indexAt(0), 0); + assert.strictEqual(rangeMap.indexAt(10), 0); + assert.strictEqual(rangeMap.indexAt(-1), -1); + assert.strictEqual(rangeMap.positionAt(0), -1); + assert.strictEqual(rangeMap.positionAt(10), -1); + assert.strictEqual(rangeMap.positionAt(-1), -1); + }); + + test('simple', () => { + rangeMap.splice(0, 0, [one]); + assert.strictEqual(rangeMap.indexAt(0), 0); + assert.strictEqual(rangeMap.indexAt(1), 0); + assert.strictEqual(rangeMap.indexAt(10), 0); + assert.strictEqual(rangeMap.indexAt(11), 1); + assert.strictEqual(rangeMap.positionAt(0), 10); + assert.strictEqual(rangeMap.positionAt(1), -1); + }); + }); +}); diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts index 23e2b720421..d49357f051a 100644 --- a/src/vs/base/test/common/arrays.test.ts +++ b/src/vs/base/test/common/arrays.test.ts @@ -404,7 +404,7 @@ suite('Arrays', () => { assert.deepStrictEqual(queue1.takeWhile(x => true), [7, 6]); }); - test('TakeWhile 1', () => { + test('TakeFromEndWhile 1', () => { const queue1 = new arrays.ArrayQueue([9, 8, 1, 7, 6]); assert.deepStrictEqual(queue1.takeFromEndWhile(x => x > 5), [7, 6]); assert.deepStrictEqual(queue1.takeFromEndWhile(x => x < 2), [1]); diff --git a/src/vs/base/test/common/async.test.ts b/src/vs/base/test/common/async.test.ts index 2d131c8967b..144c119389a 100644 --- a/src/vs/base/test/common/async.test.ts +++ b/src/vs/base/test/common/async.test.ts @@ -155,6 +155,40 @@ suite('Async', () => { return Promise.all(promises); }); + + test('disposal after queueing', async () => { + let factoryCalls = 0; + const factory = async () => { + factoryCalls++; + return async.timeout(0); + }; + + const throttler = new async.Throttler(); + const promises: Promise[] = []; + + promises.push(throttler.queue(factory)); + promises.push(throttler.queue(factory)); + throttler.dispose(); + + await Promise.all(promises); + assert.strictEqual(factoryCalls, 1); + }); + + test('disposal before queueing', async () => { + let factoryCalls = 0; + const factory = async () => { + factoryCalls++; + return async.timeout(0); + }; + + const throttler = new async.Throttler(); + const promises: Promise[] = []; + + throttler.dispose(); + assert.throws(() => promises.push(throttler.queue(factory))); + assert.strictEqual(factoryCalls, 0); + await Promise.all(promises); + }); }); suite('Delayer', function () { @@ -221,6 +255,12 @@ suite('Async', () => { // OK } }); + + test('trigger after dispose throws', async () => { + const throttledDelayer = new async.ThrottledDelayer(100); + throttledDelayer.dispose(); + await assert.rejects(() => throttledDelayer.trigger(async () => { }, 0)); + }); }); test('simple cancel', function () { diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts index 5162306d8c0..84c0d21dbb7 100644 --- a/src/vs/base/test/common/event.test.ts +++ b/src/vs/base/test/common/event.test.ts @@ -3,10 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; +import { stub } from 'sinon'; import { timeout } from 'vs/base/common/async'; import { CancellationToken } from 'vs/base/common/cancellation'; import { errorHandler, setUnexpectedErrorHandler } from 'vs/base/common/errors'; -import { AsyncEmitter, DebounceEmitter, Emitter, Event, EventBufferer, EventMultiplexer, IWaitUntil, MicrotaskEmitter, PauseableEmitter, Relay } from 'vs/base/common/event'; +import { AsyncEmitter, DebounceEmitter, Emitter, Event, EventBufferer, EventMultiplexer, IWaitUntil, MicrotaskEmitter, PauseableEmitter, Relay, createEventDeliveryQueue } from 'vs/base/common/event'; import { DisposableStore, IDisposable, isDisposable, setDisposableTracker, toDisposable } from 'vs/base/common/lifecycle'; import { observableValue, transaction } from 'vs/base/common/observable'; import { MicrotaskDelay } from 'vs/base/common/symbols'; @@ -127,6 +128,104 @@ suite('Event', function () { assert.strictEqual(counter.count, 2); }); + test('Emitter duplicate functions', () => { + const calls: string[] = []; + const a = (v: string) => calls.push(`a${v}`); + const b = (v: string) => calls.push(`b${v}`); + + const emitter = new Emitter(); + + emitter.event(a); + emitter.event(b); + const s2 = emitter.event(a); + + emitter.fire('1'); + assert.deepStrictEqual(calls, ['a1', 'b1', 'a1']); + + s2.dispose(); + calls.length = 0; + emitter.fire('2'); + assert.deepStrictEqual(calls, ['a2', 'b2']); + }); + + test('Emitter, dispose listener during emission', () => { + for (let keepFirstMod = 1; keepFirstMod < 4; keepFirstMod++) { + const emitter = new Emitter(); + const calls: number[] = []; + const disposables = Array.from({ length: 25 }, (_, n) => emitter.event(() => { + if (n % keepFirstMod === 0) { + disposables[n].dispose(); + } + calls.push(n); + })); + + emitter.fire(); + assert.deepStrictEqual(calls, Array.from({ length: 25 }, (_, n) => n)); + } + }); + + test('Emitter, dispose emitter during emission', () => { + const emitter = new Emitter(); + const calls: number[] = []; + const disposables = Array.from({ length: 25 }, (_, n) => emitter.event(() => { + if (n === 10) { + emitter.dispose(); + } + calls.push(n); + })); + + emitter.fire(); + disposables.forEach(d => d.dispose()); + assert.deepStrictEqual(calls, Array.from({ length: 11 }, (_, n) => n)); + }); + + test('Emitter, shared delivery queue', () => { + const deliveryQueue = createEventDeliveryQueue(); + const emitter1 = new Emitter({ deliveryQueue }); + const emitter2 = new Emitter({ deliveryQueue }); + + const calls: string[] = []; + emitter1.event(d => { calls.push(`${d}a`); if (d === 1) { emitter2.fire(2); } }); + emitter1.event(d => { calls.push(`${d}b`); }); + + emitter2.event(d => { calls.push(`${d}c`); emitter1.dispose(); }); + emitter2.event(d => { calls.push(`${d}d`); }); + + emitter1.fire(1); + + // 1. Check that 2 is not delivered before 1 finishes + // 2. Check that 2 finishes getting delivered even if one emitter is disposed + assert.deepStrictEqual(calls, ['1a', '1b', '2c', '2d']); + }); + + test('Emitter, handles removal during 3', () => { + const fn1 = stub(); + const fn2 = stub(); + const emitter = new Emitter(); + + emitter.event(fn1); + const h = emitter.event(() => { + h.dispose(); + }); + emitter.event(fn2); + emitter.fire('foo'); + + assert.deepStrictEqual(fn2.args, [['foo']]); + assert.deepStrictEqual(fn1.args, [['foo']]); + }); + + test('Emitter, handles removal during 2', () => { + const fn1 = stub(); + const emitter = new Emitter(); + + emitter.event(fn1); + const h = emitter.event(() => { + h.dispose(); + }); + emitter.fire('foo'); + + assert.deepStrictEqual(fn1.args, [['foo']]); + }); test('Emitter, bucket', function () { @@ -182,15 +281,20 @@ suite('Event', function () { assert.strictEqual(firstCount, 0); assert.strictEqual(lastCount, 0); - let subscription = a.event(function () { }); + let subscription1 = a.event(function () { }); + const subscription2 = a.event(function () { }); assert.strictEqual(firstCount, 1); assert.strictEqual(lastCount, 0); - subscription.dispose(); + subscription1.dispose(); + assert.strictEqual(firstCount, 1); + assert.strictEqual(lastCount, 0); + + subscription2.dispose(); assert.strictEqual(firstCount, 1); assert.strictEqual(lastCount, 1); - subscription = a.event(function () { }); + subscription1 = a.event(function () { }); assert.strictEqual(firstCount, 2); assert.strictEqual(lastCount, 1); }); @@ -347,6 +451,32 @@ suite('Event', function () { assert.deepStrictEqual(listener2Events, ['e1', 'e2']); }); + test('Emitter, - In Order Delivery 3x', function () { + const a = new Emitter(); + const listener2Events: string[] = []; + a.event(function listener1(event) { + if (event === 'e2') { + a.fire('e3'); + // assert that all events are delivered at this point + assert.deepStrictEqual(listener2Events, ['e1', 'e2', 'e3']); + } + }); + a.event(function listener1(event) { + if (event === 'e1') { + a.fire('e2'); + // assert that all events are delivered at this point + assert.deepStrictEqual(listener2Events, ['e1', 'e2', 'e3']); + } + }); + a.event(function listener2(event) { + listener2Events.push(event); + }); + a.fire('e1'); + + // assert that all events are delivered in order + assert.deepStrictEqual(listener2Events, ['e1', 'e2', 'e3']); + }); + test('Cannot read property \'_actual\' of undefined #142204', function () { const e = new Emitter(); const dispo = e.event(() => { }); diff --git a/src/vs/base/test/common/filters.perf.test.ts b/src/vs/base/test/common/filters.perf.test.ts index 8ac5a3c89d9..fd311ecd6f7 100644 --- a/src/vs/base/test/common/filters.perf.test.ts +++ b/src/vs/base/test/common/filters.perf.test.ts @@ -2,8 +2,9 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { importAMDNodeModule } from 'vs/amdX'; import * as filters from 'vs/base/common/filters'; -import { data } from 'vs/base/test/common/filters.perf.data'; +import { FileAccess } from 'vs/base/common/network'; const patterns = ['cci', 'ida', 'pos', 'CCI', 'enbled', 'callback', 'gGame', 'cons', 'zyx', 'aBc']; @@ -15,7 +16,10 @@ function perfSuite(name: string, callback: (this: Mocha.Suite) => void) { } } -perfSuite('Performance - fuzzyMatch', function () { +perfSuite('Performance - fuzzyMatch', async function () { + + const uri = FileAccess.asBrowserUri('vs/base/test/common/filters.perf.data').toString(true); + const { data } = await importAMDNodeModule(uri, ''); // suiteSetup(() => console.profile()); // suiteTeardown(() => console.profileEnd()); @@ -47,7 +51,10 @@ perfSuite('Performance - fuzzyMatch', function () { }); -perfSuite('Performance - IFilter', function () { +perfSuite('Performance - IFilter', async function () { + + const uri = FileAccess.asBrowserUri('vs/base/test/common/filters.perf.data').toString(true); + const { data } = await importAMDNodeModule(uri, ''); function perfTest(name: string, match: filters.IFilter) { test(name, () => { diff --git a/src/vs/base/test/common/observable.test.ts b/src/vs/base/test/common/observable.test.ts index 64d08a6c4d5..4f507c7ece7 100644 --- a/src/vs/base/test/common/observable.test.ts +++ b/src/vs/base/test/common/observable.test.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { Emitter } from 'vs/base/common/event'; +import { Emitter, Event } from 'vs/base/common/event'; import { ISettableObservable, autorun, derived, ITransaction, observableFromEvent, observableValue, transaction, keepAlive } from 'vs/base/common/observable'; -import { BaseObservable, IObservable, IObserver } from 'vs/base/common/observableImpl/base'; +import { BaseObservable, IObservable, IObserver } from 'vs/base/common/observableInternal/base'; suite('observables', () => { /** @@ -17,7 +17,8 @@ suite('observables', () => { const log = new Log(); const myObservable = observableValue('myObservable', 0); - autorun('myAutorun', (reader) => { + autorun(reader => { + /** @description myAutorun */ log.log(`myAutorun.run(myObservable: ${myObservable.read(reader)})`); }); // The autorun runs immediately @@ -49,7 +50,8 @@ suite('observables', () => { const observable1 = observableValue('myObservable1', 0); const observable2 = observableValue('myObservable2', 0); - const myDerived = derived('myDerived', (reader) => { + const myDerived = derived(reader => { + /** @description myDerived */ const value1 = observable1.read(reader); const value2 = observable2.read(reader); const sum = value1 + value2; @@ -57,7 +59,8 @@ suite('observables', () => { return sum; }); - autorun('myAutorun', (reader) => { + autorun(reader => { + /** @description myAutorun */ log.log(`myAutorun(myDerived: ${myDerived.read(reader)})`); }); // autorun runs immediately @@ -110,7 +113,8 @@ suite('observables', () => { const observable1 = observableValue('myObservable1', 0); const observable2 = observableValue('myObservable2', 0); - const myDerived = derived('myDerived', (reader) => { + const myDerived = derived((reader) => { + /** @description myDerived */ const value1 = observable1.read(reader); const value2 = observable2.read(reader); const sum = value1 + value2; @@ -118,7 +122,8 @@ suite('observables', () => { return sum; }); - autorun('myAutorun', (reader) => { + autorun(reader => { + /** @description myAutorun */ log.log(`myAutorun(myDerived: ${myDerived.read(reader)})`); }); // autorun runs immediately @@ -147,25 +152,29 @@ suite('observables', () => { test('get without observers', () => { const log = new Log(); const observable1 = observableValue('myObservableValue1', 0); - const computed1 = derived('computed', (reader) => { + const computed1 = derived((reader) => { + /** @description computed */ const value1 = observable1.read(reader); const result = value1 % 3; log.log(`recompute1: ${value1} % 3 = ${result}`); return result; }); - const computed2 = derived('computed', (reader) => { + const computed2 = derived((reader) => { + /** @description computed */ const value1 = computed1.read(reader); const result = value1 * 2; log.log(`recompute2: ${value1} * 2 = ${result}`); return result; }); - const computed3 = derived('computed', (reader) => { + const computed3 = derived((reader) => { + /** @description computed */ const value1 = computed1.read(reader); const result = value1 * 3; log.log(`recompute3: ${value1} * 3 = ${result}`); return result; }); - const computedSum = derived('computed', (reader) => { + const computedSum = derived((reader) => { + /** @description computed */ const value1 = computed2.read(reader); const value2 = computed3.read(reader); const result = value1 + value2; @@ -256,7 +265,8 @@ suite('observables', () => { const myObservable1 = observableValue('myObservable1', 0); const myObservable2 = observableValue('myObservable2', 0); - const myComputed1 = derived('myComputed1', (reader) => { + const myComputed1 = derived(reader => { + /** @description myComputed1 */ const value1 = myObservable1.read(reader); const value2 = myObservable2.read(reader); const sum = value1 + value2; @@ -264,7 +274,8 @@ suite('observables', () => { return sum; }); - const myComputed2 = derived('myComputed2', (reader) => { + const myComputed2 = derived(reader => { + /** @description myComputed2 */ const value1 = myComputed1.read(reader); const value2 = myObservable1.read(reader); const value3 = myObservable2.read(reader); @@ -273,7 +284,8 @@ suite('observables', () => { return sum; }); - const myComputed3 = derived('myComputed3', (reader) => { + const myComputed3 = derived(reader => { + /** @description myComputed3 */ const value1 = myComputed2.read(reader); const value2 = myObservable1.read(reader); const value3 = myObservable2.read(reader); @@ -282,7 +294,8 @@ suite('observables', () => { return sum; }); - autorun('myAutorun', (reader) => { + autorun(reader => { + /** @description myAutorun */ log.log(`myAutorun.run(myComputed3: ${myComputed3.read(reader)})`); }); assert.deepStrictEqual(log.getAndClearEntries(), [ @@ -364,7 +377,8 @@ suite('observables', () => { setValue(undefined); - const autorunDisposable = autorun('MyAutorun', (reader) => { + const autorunDisposable = autorun(reader => { + /** @description MyAutorun */ observable.read(reader); log.log( `autorun, value: ${observable.read(reader)}` @@ -396,7 +410,8 @@ suite('observables', () => { const shouldReadObservable = observableValue('shouldReadObservable', true); - const autorunDisposable = autorun('MyAutorun', (reader) => { + const autorunDisposable = autorun(reader => { + /** @description MyAutorun */ if (shouldReadObservable.read(reader)) { observable.read(reader); log.log( @@ -468,14 +483,16 @@ suite('observables', () => { const shouldReadObservable = observableValue('shouldReadMyObs1', true); const myObs1 = new LoggingObservableValue('myObs1', 0, log); - const myComputed = derived('myComputed', reader => { + const myComputed = derived(reader => { + /** @description myComputed */ log.log('myComputed.recompute'); if (shouldReadObservable.read(reader)) { return myObs1.read(reader); } return 1; }); - autorun('myAutorun', reader => { + autorun(reader => { + /** @description myAutorun */ const value = myComputed.read(reader); log.log(`myAutorun: ${value}`); }); @@ -508,14 +525,16 @@ suite('observables', () => { const myObsShouldRead = new LoggingObservableValue('myObsShouldRead', true, log); const myObs1 = new LoggingObservableValue('myObs1', 0, log); - const myComputed1 = derived('myComputed1', reader => { + const myComputed1 = derived(reader => { + /** @description myComputed1 */ const myObs1Val = myObs1.read(reader); const result = myObs1Val % 10; log.log(`myComputed1(myObs1: ${myObs1Val}): Computed ${result}`); return myObs1Val; }); - autorun('myAutorun', reader => { + autorun(reader => { + /** @description myAutorun */ const shouldRead = myObsShouldRead.read(reader); if (shouldRead) { const v = myComputed1.read(reader); @@ -568,7 +587,8 @@ suite('observables', () => { const log = new Log(); const myObservable = observableValue('myObservable', 0); - autorun('myAutorun', (reader) => { + autorun(reader => { + /** @description myAutorun */ log.log(`myAutorun.run(myObservable: ${myObservable.read(reader)})`); }); assert.deepStrictEqual(log.getAndClearEntries(), ['myAutorun.run(myObservable: 0)']); @@ -587,13 +607,15 @@ suite('observables', () => { test('autorun does not rerun on indirect neutral observable double change', () => { const log = new Log(); const myObservable = observableValue('myObservable', 0); - const myDerived = derived('myDerived', (reader) => { + const myDerived = derived(reader => { + /** @description myDerived */ const val = myObservable.read(reader); log.log(`myDerived.read(myObservable: ${val})`); return val; }); - autorun('myAutorun', (reader) => { + autorun(reader => { + /** @description myAutorun */ log.log(`myAutorun.run(myDerived: ${myDerived.read(reader)})`); }); assert.deepStrictEqual(log.getAndClearEntries(), [ @@ -616,13 +638,15 @@ suite('observables', () => { test('autorun reruns on indirect neutral observable double change when changes propagate', () => { const log = new Log(); const myObservable = observableValue('myObservable', 0); - const myDerived = derived('myDerived', (reader) => { + const myDerived = derived(reader => { + /** @description myDerived */ const val = myObservable.read(reader); log.log(`myDerived.read(myObservable: ${val})`); return val; }); - autorun('myAutorun', (reader) => { + autorun(reader => { + /** @description myAutorun */ log.log(`myAutorun.run(myDerived: ${myDerived.read(reader)})`); }); assert.deepStrictEqual(log.getAndClearEntries(), [ @@ -656,7 +680,8 @@ suite('observables', () => { const myObservable2 = new LoggingObservableValue('myObservable2', 0, log); const myObservable3 = new LoggingObservableValue('myObservable3', 0, log); - const d = autorun('autorun', (reader) => { + const d = autorun(reader => { + /** @description autorun */ if (observable1.read(reader) >= 2) { assert.deepStrictEqual(log.getAndClearEntries(), [ "myObservable1.set (value 2)", @@ -706,13 +731,15 @@ suite('observables', () => { const myObservable1 = new LoggingObservableValue('myObservable1', 0, log); const myObservable2 = new LoggingObservableValue('myObservable2', 0, log); - const myDerived1 = derived('myDerived1', (reader) => { + const myDerived1 = derived(reader => { + /** @description myDerived1 */ const val = myObservable1.read(reader); log.log(`myDerived1.read(myObservable: ${val})`); return val; }); - const myDerived2 = derived('myDerived2', (reader) => { + const myDerived2 = derived(reader => { + /** @description myDerived2 */ const val = myObservable2.read(reader); if (val === 1) { myDerived1.read(reader); @@ -721,7 +748,8 @@ suite('observables', () => { return val; }); - autorun('myAutorun', (reader) => { + autorun(reader => { + /** @description myAutorun */ const myDerived1Val = myDerived1.read(reader); const myDerived2Val = myDerived2.read(reader); log.log(`myAutorun.run(myDerived1: ${myDerived1Val}, myDerived2: ${myDerived2Val})`); @@ -739,7 +767,8 @@ suite('observables', () => { const log = new Log(); const myObservable = new LoggingObservableValue('myObservable', 0, log); - const myComputed = derived('myComputed', reader => { + const myComputed = derived(reader => { + /** @description myComputed */ let value = myObservable.read(reader); const origValue = value; log.log(`myComputed(myObservable: ${origValue}): start computing`); @@ -751,7 +780,8 @@ suite('observables', () => { return value; }); - autorun('myAutorun', reader => { + autorun(reader => { + /** @description myAutorun */ const value = myComputed.read(reader); log.log(`myAutorun(myComputed: ${value})`); }); @@ -785,7 +815,8 @@ suite('observables', () => { const log = new Log(); const myObservable = new LoggingObservableValue('myObservable', 0, log); - autorun('myAutorun', reader => { + autorun(reader => { + /** @description myAutorun */ const value = myObservable.read(reader); log.log(`myAutorun(myObservable: ${value}): start`); if (value !== 0 && value < 4) { @@ -825,19 +856,22 @@ suite('observables', () => { const log = new Log(); const myObservable = new LoggingObservableValue('myObservable', 0, log); - const myDerived1 = derived('myDerived1', reader => { + const myDerived1 = derived(reader => { + /** @description myDerived1 */ const value = myObservable.read(reader); log.log(`myDerived1(myObservable: ${value}): start computing`); return value; }); - const myDerived2 = derived('myDerived2', reader => { + const myDerived2 = derived(reader => { + /** @description myDerived2 */ const value = myDerived1.read(reader); log.log(`myDerived2(myDerived1: ${value}): start computing`); return value; }); - autorun('myAutorun', reader => { + autorun(reader => { + /** @description myAutorun */ const value = myDerived2.read(reader); log.log(`myAutorun(myDerived2: ${value})`); }); @@ -880,20 +914,23 @@ suite('observables', () => { const myObservable1 = new LoggingObservableValue('myObservable1', 0, log); const myObservable2 = new LoggingObservableValue('myObservable2', 0, log); - const myDerived2 = derived('myDerived2', reader => { + const myDerived2 = derived(reader => { + /** @description myDerived2 */ const val = myObservable2.read(reader); log.log(`myDerived2.computed(myObservable2: ${val})`); return val % 10; }); - const myDerived3 = derived('myDerived3', reader => { + const myDerived3 = derived(reader => { + /** @description myDerived3 */ const val1 = myObservable1.read(reader); const val2 = myDerived2.read(reader); log.log(`myDerived3.computed(myDerived1: ${val1}, myDerived2: ${val2})`); return `${val1} + ${val2}`; }); - autorun('myAutorun', reader => { + autorun(reader => { + /** @description myAutorun */ const val = myDerived3.read(reader); log.log(`myAutorun(myDerived3: ${val})`); }); @@ -931,15 +968,17 @@ suite('observables', () => { const myObservable1 = observableValue('myObservable1', 0); const myObservable2 = observableValue('myObservable2', 0); - const myDerived1 = derived('myDerived1', reader => { + const myDerived1 = derived(reader => { + /** @description myDerived1 */ return myObservable1.read(reader); }); - const myDerived2 = derived('myDerived2', reader => { + const myDerived2 = derived(reader => { + /** @description myDerived2 */ return myObservable2.read(reader); }); - const myDerivedA1 = derived('myDerivedA1', reader => { + const myDerivedA1 = derived(reader => /** @description myDerivedA1 */ { const d1 = myDerived1.read(reader); if (d1 === 1) { // This adds an observer while myDerived is still in update mode. @@ -949,11 +988,13 @@ suite('observables', () => { } }); - autorun('myAutorun1', reader => { + autorun(reader => { + /** @description myAutorun1 */ myDerivedA1.read(reader); }); - autorun('myAutorun2', reader => { + autorun(reader => { + /** @description myAutorun2 */ myDerived2.read(reader); }); @@ -962,6 +1003,60 @@ suite('observables', () => { myObservable2.set(1, tx); }); }); + + test('bug: fromObservableLight doesnt subscribe', () => { + const log = new Log(); + const myObservable = new LoggingObservableValue('myObservable', 0, log); + + const myDerived = derived(reader => /** @description myDerived */ { + const val = myObservable.read(reader); + log.log(`myDerived.computed(myObservable2: ${val})`); + return val % 10; + }); + + const e = Event.fromObservableLight(myDerived); + log.log('event created'); + e(() => { + log.log('event fired'); + }); + + myObservable.set(1, undefined); + + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'event created', + 'myObservable.firstObserverAdded', + 'myObservable.get', + 'myDerived.computed(myObservable2: 0)', + 'myObservable.set (value 1)', + 'myObservable.get', + 'myDerived.computed(myObservable2: 1)', + 'event fired', + ]); + }); + + test('dont run autorun after dispose', () => { + const log = new Log(); + const myObservable = new LoggingObservableValue('myObservable', 0, log); + + const d = autorun(reader => { + /** @description update */ + const v = myObservable.read(reader); + log.log('autorun, myObservable:' + v); + }); + + transaction(tx => { + myObservable.set(1, tx); + d.dispose(); + }); + + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'myObservable.firstObserverAdded', + 'myObservable.get', + 'autorun, myObservable:0', + 'myObservable.set (value 1)', + 'myObservable.lastObserverRemoved', + ]); + }); }); export class LoggingObserver implements IObserver { diff --git a/src/vs/base/test/common/prefixTree.test.ts b/src/vs/base/test/common/prefixTree.test.ts new file mode 100644 index 00000000000..b93921810d3 --- /dev/null +++ b/src/vs/base/test/common/prefixTree.test.ts @@ -0,0 +1,137 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { WellDefinedPrefixTree } from 'vs/base/common/prefixTree'; +import * as assert from 'assert'; + +suite('WellDefinedPrefixTree', () => { + let tree: WellDefinedPrefixTree; + + setup(() => { + tree = new WellDefinedPrefixTree(); + }); + + test('find', () => { + const key1 = ['foo', 'bar']; + const key2 = ['foo', 'baz']; + tree.insert(key1, 42); + tree.insert(key2, 43); + assert.strictEqual(tree.find(key1), 42); + assert.strictEqual(tree.find(key2), 43); + assert.strictEqual(tree.find(['foo', 'baz', 'bop']), undefined); + assert.strictEqual(tree.find(['foo']), undefined); + }); + + test('hasParentOfKey', () => { + const key = ['foo', 'bar']; + tree.insert(key, 42); + + assert.strictEqual(tree.hasKeyOrParent(['foo', 'bar', 'baz']), true); + assert.strictEqual(tree.hasKeyOrParent(['foo', 'bar']), true); + assert.strictEqual(tree.hasKeyOrParent(['foo']), false); + assert.strictEqual(tree.hasKeyOrParent(['baz']), false); + }); + + + test('hasKeyOrChildren', () => { + const key = ['foo', 'bar']; + tree.insert(key, 42); + + assert.strictEqual(tree.hasKeyOrChildren([]), true); + assert.strictEqual(tree.hasKeyOrChildren(['foo']), true); + assert.strictEqual(tree.hasKeyOrChildren(['foo', 'bar']), true); + assert.strictEqual(tree.hasKeyOrChildren(['foo', 'bar', 'baz']), false); + }); + + test('hasKey', () => { + const key = ['foo', 'bar']; + tree.insert(key, 42); + + assert.strictEqual(tree.hasKey(key), true); + assert.strictEqual(tree.hasKey(['foo']), false); + assert.strictEqual(tree.hasKey(['baz']), false); + assert.strictEqual(tree.hasKey(['foo', 'bar', 'baz']), false); + }); + + test('size', () => { + const key1 = ['foo', 'bar']; + const key2 = ['foo', 'baz']; + assert.strictEqual(tree.size, 0); + tree.insert(key1, 42); + assert.strictEqual(tree.size, 1); + tree.insert(key2, 43); + assert.strictEqual(tree.size, 2); + tree.insert(key2, 44); + assert.strictEqual(tree.size, 2); + }); + + test('mutate', () => { + const key1 = ['foo', 'bar']; + const key2 = ['foo', 'baz']; + tree.insert(key1, 42); + tree.insert(key2, 43); + tree.mutate(key1, (value) => { + assert.strictEqual(value, 42); + return 44; + }); + assert.strictEqual(tree.find(key1), 44); + assert.strictEqual(tree.find(key2), 43); + }); + + test('delete', () => { + const key1 = ['foo', 'bar']; + const key2 = ['foo', 'baz']; + tree.insert(key1, 42); + tree.insert(key2, 43); + assert.strictEqual(tree.size, 2); + + assert.strictEqual(tree.delete(key1), 42); + assert.strictEqual(tree.size, 1); + assert.strictEqual(tree.find(key1), undefined); + assert.strictEqual(tree.find(key2), 43); + + assert.strictEqual(tree.delete(key2), 43); + assert.strictEqual(tree.size, 0); + assert.strictEqual(tree.find(key1), undefined); + assert.strictEqual(tree.find(key2), undefined); + + tree.delete(key2); + assert.strictEqual(tree.size, 0); + }); + + test('delete child', () => { + const key1 = ['foo', 'bar']; + const key2 = ['foo', 'bar', 'baz']; + tree.insert(key1, 42); + tree.insert(key2, 43); + assert.strictEqual(tree.size, 2); + + assert.strictEqual(tree.delete(key2), 43); + assert.strictEqual(tree.size, 1); + assert.strictEqual(tree.find(key1), 42); + assert.strictEqual(tree.find(key2), undefined); + }); + + test('delete noops if deleting parent', () => { + const key1 = ['foo', 'bar']; + const key2 = ['foo', 'bar', 'baz']; + tree.insert(key2, 43); + assert.strictEqual(tree.size, 1); + + assert.strictEqual(tree.delete(key1), undefined); + assert.strictEqual(tree.size, 1); + assert.strictEqual(tree.find(key2), 43); + assert.strictEqual(tree.find(key1), undefined); + }); + + test('values', () => { + const key1 = ['foo', 'bar']; + const key2 = ['foo', 'baz']; + tree.insert(key1, 42); + tree.insert(key2, 43); + + assert.deepStrictEqual([...tree.values()], [43, 42]); + }); +}); diff --git a/src/vs/base/test/common/skipList.test.ts b/src/vs/base/test/common/skipList.test.ts index 9712f498f20..d9c75702f1c 100644 --- a/src/vs/base/test/common/skipList.test.ts +++ b/src/vs/base/test/common/skipList.test.ts @@ -154,18 +154,18 @@ suite('SkipList', function () { // init const list = new SkipList(cmp, max); - let sw = new StopWatch(true); + let sw = new StopWatch(); values.forEach(value => list.set(value, true)); sw.stop(); console.log(`[LIST] ${list.size} elements after ${sw.elapsed()}ms`); let array: number[] = []; - sw = new StopWatch(true); + sw = new StopWatch(); values.forEach(value => array = insertArraySorted(array, value)); sw.stop(); console.log(`[ARRAY] ${array.length} elements after ${sw.elapsed()}ms`); // get - sw = new StopWatch(true); + sw = new StopWatch(); const someValues = [...values].slice(0, values.size / 4); someValues.forEach(key => { const value = list.get(key); // find @@ -174,7 +174,7 @@ suite('SkipList', function () { }); sw.stop(); console.log(`[LIST] retrieve ${sw.elapsed()}ms (${(sw.elapsed() / (someValues.length * 2)).toPrecision(4)}ms/op)`); - sw = new StopWatch(true); + sw = new StopWatch(); someValues.forEach(key => { const idx = binarySearch(array, key, cmp); // find console.assert(idx >= 0, '[ARRAY] must have ' + key); @@ -185,13 +185,13 @@ suite('SkipList', function () { // insert - sw = new StopWatch(true); + sw = new StopWatch(); someValues.forEach(key => { list.set(-key, false); }); sw.stop(); console.log(`[LIST] insert ${sw.elapsed()}ms (${(sw.elapsed() / someValues.length).toPrecision(4)}ms/op)`); - sw = new StopWatch(true); + sw = new StopWatch(); someValues.forEach(key => { array = insertArraySorted(array, -key); }); @@ -199,14 +199,14 @@ suite('SkipList', function () { console.log(`[ARRAY] insert ${sw.elapsed()}ms (${(sw.elapsed() / someValues.length).toPrecision(4)}ms/op)`); // delete - sw = new StopWatch(true); + sw = new StopWatch(); someValues.forEach(key => { list.delete(key); // find list.delete(-key); // miss }); sw.stop(); console.log(`[LIST] delete ${sw.elapsed()}ms (${(sw.elapsed() / (someValues.length * 2)).toPrecision(4)}ms/op)`); - sw = new StopWatch(true); + sw = new StopWatch(); someValues.forEach(key => { array = delArraySorted(array, key); // find array = delArraySorted(array, -key); // miss diff --git a/src/vs/base/test/common/ternarySearchtree.test.ts b/src/vs/base/test/common/ternarySearchtree.test.ts index 4ad5d8bbebd..c2f27122730 100644 --- a/src/vs/base/test/common/ternarySearchtree.test.ts +++ b/src/vs/base/test/common/ternarySearchtree.test.ts @@ -961,7 +961,7 @@ suite.skip('TST, perf', function () { function perfTest(name: string, callback: Function) { test(name, function () { if (_profile) { console.profile(name); } - const sw = new StopWatch(true); + const sw = new StopWatch(); callback(); console.log(name, sw.elapsed()); if (_profile) { console.profileEnd(); } diff --git a/src/vs/base/test/node/nodeStreams.test.ts b/src/vs/base/test/node/nodeStreams.test.ts new file mode 100644 index 00000000000..620f817dfc9 --- /dev/null +++ b/src/vs/base/test/node/nodeStreams.test.ts @@ -0,0 +1,51 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + + +import { Writable } from 'stream'; +import * as assert from 'assert'; +import { StreamSplitter } from 'vs/base/node/nodeStreams'; + +suite('StreamSplitter', () => { + test('should split a stream on a single character splitter', (done) => { + const chunks: string[] = []; + const splitter = new StreamSplitter('\n'); + const writable = new Writable({ + write(chunk, _encoding, callback) { + chunks.push(chunk.toString()); + callback(); + }, + }); + + splitter.pipe(writable); + splitter.write('hello\nwor'); + splitter.write('ld\n'); + splitter.write('foo\nbar\nz'); + splitter.end(() => { + assert.deepStrictEqual(chunks, ['hello\n', 'world\n', 'foo\n', 'bar\n', 'z']); + done(); + }); + }); + + test('should split a stream on a multi-character splitter', (done) => { + const chunks: string[] = []; + const splitter = new StreamSplitter('---'); + const writable = new Writable({ + write(chunk, _encoding, callback) { + chunks.push(chunk.toString()); + callback(); + }, + }); + + splitter.pipe(writable); + splitter.write('hello---wor'); + splitter.write('ld---'); + splitter.write('foo---bar---z'); + splitter.end(() => { + assert.deepStrictEqual(chunks, ['hello---', 'world---', 'foo---', 'bar---', 'z']); + done(); + }); + }); +}); diff --git a/src/vs/base/test/node/pfs/fixtures/index.html b/src/vs/base/test/node/pfs/fixtures/index.html index 165a4ecbccd..8fc5f33ee2e 100644 --- a/src/vs/base/test/node/pfs/fixtures/index.html +++ b/src/vs/base/test/node/pfs/fixtures/index.html @@ -41,12 +41,12 @@ }