Merge branch 'vnext' into rzhao271/settings-override-notes

api/extension-guides/notebook.md

@@ -218,10 +218,10 @@ try {
 Rich outputs are the most advanced form of displaying cell outputs. They allow for providing many different representations of the output data, keyed by mimetype. For example, if a cell output was to represent a GitHub Issue, the kernel might produce a rich output with several properties on its `data` field:
 
 * A `text/html` field containing a formatted view of the issue.
-* An `application/json` field containing a machine readable view.
+* A `text/x-json` field containing a machine readable view.
 * An `application/github-issue` field that a `NotebookRenderer` could use to create a fully interactive view of the issue.
 
-In this case, the `text/html` and `application/json` views will be rendered by VS Code natively, but the `application/github-issue` view will display an error if no `NotebookRenderer` was registered to that mimetype.
+In this case, the `text/html` and `text/x-json` views will be rendered by VS Code natively, but the `application/github-issue` view will display an error if no `NotebookRenderer` was registered to that mimetype.
 
 ```ts
 execution.replaceOutput([new vscode.NotebookCellOutput([
@@ -245,7 +245,7 @@ By default, VS Code can render the following mimetypes:
 
 VS Code will render these mimetypes as code in a built-in editor:
 
-* application/json
+* text/x-json
 * text/x-javascript
 * text/x-html
 * text/x-rust

api/extension-guides/webview.md

@@ -1032,7 +1032,7 @@ Although `retainContextWhenHidden` may be appealing, keep in mind that this has
 
 ## Accessibility
 
-The class `vscode-using-screen-reader` will be added to your webview's main body in contexts where the user is operating vscode with a screen reader. Additionally, the class `vscode-reduce-motion` will be added to the document's main body element in cases where the user has expressed a preference to reduce the amount of motion in the window. By observing these classes and adjusting your rendering accordingly, your webview content can better reflect the user's preferences.
+The class `vscode-using-screen-reader` will be added to your webview's main body in contexts where the user is operating VS Code with a screen reader. Additionally, the class `vscode-reduce-motion` will be added to the document's main body element in cases where the user has expressed a preference to reduce the amount of motion in the window. By observing these classes and adjusting your rendering accordingly, your webview content can better reflect the user's preferences.
 
 ## Next steps
 

api/language-extensions/semantic-highlight-guide.md

@@ -150,20 +150,22 @@ If necessary, extensions can declare new types and modifiers or create sub types
     }]
   }
 }
+```
 
 In the example above, an extension declares a new type `templateType` and a new modifier `native`. By naming `type` as the super type, styling rules for `type` will also apply to `templateType`:
-```
+
+```json
 {
   "name": "Red Theme",
   "semanticTokenColors": {
     "type": "#ff0011"
   }
 }
 ```
-applies to both `type` and all it's subtypes, including `templateType`
 
+The `semanticTokenColors` value shown above applies to both `type` and all it's subtypes, including `templateType`.
 
-Along with custom token types, extensions can define how these are mapped to TextMate scopes. This is described in the [Custom Mappings](#custom-textmate-scope-mappings) section. Note that custom mapping rules are not automatically inherited from the super type. Instead, subtypes need to refefine the mapping, preferrably to more specific scopes.
+Along with custom token types, extensions can define how these are mapped to TextMate scopes. This is described in the [Custom Mappings](#custom-textmate-scope-mappings) section. Note that custom mapping rules are not automatically inherited from the super type. Instead, subtypes need to redefine the mapping, preferably to more specific scopes.
 
 ## Enablement of semantic highlighting
 

api/references/contribution-points.md

@@ -29,6 +29,9 @@ MetaDescription: To extend Visual Studio Code, your extension (plug-in) declares
 - [`problemPatterns`](/api/references/contribution-points#contributes.problemPatterns)
 - [`productIconThemes`](/api/references/contribution-points#contributes.productIconThemes)
 - [`resourceLabelFormatters`](/api/references/contribution-points#contributes.resourceLabelFormatters)
+- [`semanticTokenModifiers`](/api/references/contribution-points#contributes.semanticTokenModifiers)
+- [`semanticTokenScopes`](/api/references/contribution-points#contributes.semanticTokenScopes)
+- [`semanticTokenTypes`](/api/references/contribution-points#contributes.semanticTokenTypes)
 - [`snippets`](/api/references/contribution-points#contributes.snippets)
 - [`submenus`](/api/references/contribution-points#contributes.submenus)
 - [`taskDefinitions`](/api/references/contribution-points#contributes.taskDefinitions)
@@ -1020,6 +1023,66 @@ Contributes resource label formatters that specify how to display URIs everywher
 
 This means that all URIs that have a scheme `remotehub` will get rendered by showing only the `path` segment of the URI and the separator will be `/`. Workspaces which have the `remotehub` URI will have the GitHub suffix in their label.
 
+## contributes.semanticTokenModifiers
+
+Contributes new semantic token modifiers that can be highlighted via theme rules.
+
+```json
+{
+  "contributes": {
+    "semanticTokenModifiers": [
+      {
+        "id": "native",
+        "description": "Annotates a symbol that is implemented natively"
+      }
+    ]
+  }
+}
+```
+
+See the [Semantic Highlighting Guide](/api/language-extensions/semantic-highlight-guide) to read more about semantic highlighting.
+
+## contributes.semanticTokenScopes
+
+Contributes mapping between semantic token types & modifiers and scopes either as a fallback or to support language-specific themes.
+
+```json
+{
+  "contributes": {
+    "semanticTokenScopes": [
+      {
+        "language": "typescript",
+        "scopes": {
+          "property.readonly": ["variable.other.constant.property.ts"]
+        }
+      }
+    ]
+  }
+}
+```
+
+See the [Semantic Highlighting Guide](/api/language-extensions/semantic-highlight-guide) to read more about semantic highlighting.
+
+## contributes.semanticTokenTypes
+
+Contributes new semantic token types that can be highlighted via theme rules.
+
+```json
+{
+  "contributes": {
+    "semanticTokenTypes": [
+      {
+        "id": "templateType",
+        "superType": "type",
+        "description": "A template type."
+      }
+    ]
+  }
+}
+```
+
+See the [Semantic Highlighting Guide](/api/language-extensions/semantic-highlight-guide) to read more about semantic highlighting.
+
 ## contributes.snippets
 
 Contribute snippets for a specific language. The `language` attribute is the [language identifier](/docs/languages/identifiers) and the `path` is the relative path to the snippet file, which defines snippets in the [VS Code snippet format](/docs/editor/userdefinedsnippets#_snippet-syntax).

api/working-with-extensions/continuous-integration.md

@@ -31,7 +31,7 @@ Then, add the following `azure-pipelines.yml` file to the root of your extension
 trigger:
   branches:
     include:
-    - master
+    - main
   tags:
     include:
     - v*
@@ -97,7 +97,7 @@ You can enable the build to run continuously when pushing to a branch and even o
 trigger:
   branches:
     include:
-    - master
+    - main
   tags:
     include:
     - refs/tags/v*
@@ -133,7 +133,7 @@ You can also configure GitHub Actions to run your extension CI. In headless Linu
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
@@ -173,7 +173,7 @@ jobs:
 on:
   push:
     branches:
-    - master
+    - main
   release:
     types:
     - created