Merge branch 'master' into master

2020-06-23 11:02:40 +02:00 · 2020-06-23 11:02:40 +02:00 · 653a7af4aa
parent 38e500687d fb94ca50fc
commit 653a7af4aa
495 changed files with 13243 additions and 9714 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -519,7 +519,8 @@
                    "**/vs/workbench/services/**/common/**",
                    "**/vs/workbench/api/**/common/**",
                    "vscode-textmate",
-                    "vscode-oniguruma"
+                    "vscode-oniguruma",
+                    "iconv-lite-umd"
                ]
            },
            {
--- a/.github/classifier.json
+++ b/.github/classifier.json
@ -1,82 +1,181 @@
 {
-	"$schema": "https://raw.githubusercontent.com/microsoft/vscode-github-triage-actions/master/classifier/apply/apply-labels/classifier-config.schema.json",
+	"$schema": "https://raw.githubusercontent.com/microsoft/vscode-github-triage-actions/master/classifier-deep/apply/apply-labels/deep-classifier-config.schema.json",
 	"assignees": {
-		"JacksonKearl": {
-			"assign": true
-		},
-		"bpasero": {
-			"assign": true
-		},
-		"Tyriar": {
-			"assign": true
-		},
-		"misolori": {
-			"assign": true
-		},
-		"joaomoreno": {
-			"assign": true
-		}
+		"JacksonKearl": {"accuracy": 0.5}
 	},
 	"labels": {
-		"search-editor": {
-			"applyLabel": true,
-			"assign": [
-				"JacksonKearl"
-			]
-		},
-		"snippets": {
-			"applyLabel": false,
-			"assign": [
-				"jrieken"
-			]
-		},
-		"integrated-terminal": {
-			"applyLabel": true,
-			"assign": [
-				"Tyriar"
-			]
-		},
-		"workbench-editors": {
-			"applyLabel": false,
-			"assign": [
-				"bpasero"
-			]
-		},
-		"workbench-history": {
-			"applyLabel": false,
-			"assign": [
-				"bpasero"
-			]
-		},
-		"workbench-notifications": {
-			"applyLabel": false,
-			"assign": [
-				"bpasero"
-			]
-		},
-		"workbench-tabs": {
-			"applyLabel": false,
-			"assign": [
-				"bpasero"
-			]
-		},
-		"icons-product": {
-			"applyLabel": true,
-			"assign": [
-				"misolori"
-			]
-		},
-		"ux": {
-			"applyLabel": true,
-			"assign": [
-				"misolori"
-			]
-		},
-		"git": {
-			"applyLabel": false,
-			"assign": [
-				"joaomoreno"
-			]
+		"L10N": {"assign": []},
+		"VIM": {"assign": []},
+		"api": {"assign": ["jrieken"]},
+		"api-finalization": {"assign": []},
+		"api-proposal": {"assign": ["jrieken"]},
+		"authentication": {"assign": ["RMacfarlane"]},
+		"breadcrumbs": {"assign": ["jrieken"]},
+		"callhierarchy": {"assign": ["jrieken"]},
+		"code-lens": {"assign": ["jrieken"]},
+		"color-palette": {"assign": []},
+		"comments": {"assign": ["rebornix"]},
+		"config": {"assign": ["sandy081"]},
+		"context-keys": {"assign": []},
+		"css-less-scss": {"assign": ["aeschli"]},
+		"custom-editors": {"assign": ["mjbvz"]},
+		"debug": {"assign": ["weinand"]},
+		"debug-console": {"assign": ["weinand"]},
+		"dialogs": {"assign": ["sbatten"]},
+		"diff-editor": {"assign": []},
+		"dropdown": {"assign": []},
+		"editor": {"assign": ["rebornix"]},
+		"editor-autoclosing": {"assign": []},
+		"editor-autoindent": {"assign": ["rebornix"]},
+		"editor-bracket-matching": {"assign": []},
+		"editor-clipboard": {"assign": ["jrieken"]},
+		"editor-code-actions": {"assign": []},
+		"editor-color-picker": {"assign": ["rebornix"]},
+		"editor-columnselect": {"assign": ["alexdima"]},
+		"editor-commands": {"assign": ["jrieken"]},
+		"editor-comments": {"assign": []},
+		"editor-contrib": {"assign": []},
+		"editor-core": {"assign": []},
+		"editor-drag-and-drop": {"assign": ["rebornix"]},
+		"editor-error-widget": {"assign": ["sandy081"]},
+		"editor-find": {"assign": ["rebornix"]},
+		"editor-folding": {"assign": ["aeschli"]},
+		"editor-hover": {"assign": []},
+		"editor-indent-guides": {"assign": []},
+		"editor-input": {"assign": ["alexdima"]},
+		"editor-input-IME": {"assign": ["rebornix"]},
+		"editor-minimap": {"assign": []},
+		"editor-multicursor": {"assign": ["alexdima"]},
+		"editor-parameter-hints": {"assign": []},
+		"editor-render-whitespace": {"assign": []},
+		"editor-rendering": {"assign": ["alexdima"]},
+		"editor-scrollbar": {"assign": []},
+		"editor-symbols": {"assign": ["jrieken"]},
+		"editor-synced-region": {"assign": ["aeschli"]},
+		"editor-textbuffer": {"assign": ["rebornix"]},
+		"editor-theming": {"assign": []},
+		"editor-wordnav": {"assign": ["alexdima"]},
+		"editor-wrapping": {"assign": ["alexdima"]},
+		"emmet": {"assign": []},
+		"error-list": {"assign": ["sandy081"]},
+		"explorer-custom": {"assign": ["sandy081"]},
+		"extension-host": {"assign": []},
+		"extensions": {"assign": ["sandy081"]},
+		"extensions-development": {"assign": []},
+		"file-decorations": {"assign": ["jrieken"]},
+		"file-encoding": {"assign": ["bpasero"]},
+		"file-explorer": {"assign": ["isidorn"]},
+		"file-glob": {"assign": []},
+		"file-guess-encoding": {"assign": ["bpasero"]},
+		"file-io": {"assign": ["bpasero"]},
+		"file-watcher": {"assign": ["bpasero"]},
+		"font-rendering": {"assign": []},
+		"formatting": {"assign": []},
+		"git": {"assign": ["joaomoreno"]},
+		"gpu": {"assign": ["deepak1556"]},
+		"grammar": {"assign": ["mjbvz"]},
+		"grid-view": {"assign": ["joaomoreno"]},
+		"html": {"assign": ["aeschli"]},
+		"i18n": {"assign": []},
+		"icon-brand": {"assign": []},
+		"icons-product": {"assign": ["misolori"]},
+		"install-update": {"assign": ["joaomoreno"]},
+		"integrated-terminal": {"assign": ["Tyriar"]},
+		"integrated-terminal-conpty": {"assign": ["Tyriar"]},
+		"integrated-terminal-links": {"assign": ["Tyriar"]},
+		"integration-test": {"assign": []},
+		"intellisense-config": {"assign": []},
+		"ipc": {"assign": ["joaomoreno"]},
+		"issue-bot": {"assign": ["chrmarti"]},
+		"issue-reporter": {"assign": ["RMacfarlane"]},
+		"javascript": {"assign": ["mjbvz"]},
+		"json": {"assign": ["aeschli"]},
+		"keybindings": {"assign": []},
+		"keybindings-editor": {"assign": ["sandy081"]},
+		"keyboard-layout": {"assign": ["alexdima"]},
+		"languages-basic": {"assign": ["aeschli"]},
+		"languages-diagnostics": {"assign": ["jrieken"]},
+		"layout": {"assign": ["sbatten"]},
+		"lcd-text-rendering": {"assign": []},
+		"list": {"assign": ["joaomoreno"]},
+		"log": {"assign": []},
+		"markdown": {"assign": ["mjbvz"]},
+		"marketplace": {"assign": []},
+		"menus": {"assign": ["sbatten"]},
+		"merge-conflict": {"assign": ["chrmarti"]},
+		"notebook": {"assign": ["rebornix"]},
+		"outline": {"assign": ["jrieken"]},
+		"output": {"assign": []},
+		"perf": {"assign": []},
+		"perf-bloat": {"assign": []},
+		"perf-startup": {"assign": []},
+		"php": {"assign": ["roblourens"]},
+		"portable-mode": {"assign": ["joaomoreno"]},
+		"proxy": {"assign": []},
+		"quick-pick": {"assign": ["chrmarti"]},
+		"references-viewlet": {"assign": ["jrieken"]},
+		"release-notes": {"assign": []},
+		"remote": {"assign": []},
+		"remote-explorer": {"assign": ["alexr00"]},
+		"rename": {"assign": ["jrieken"]},
+		"scm": {"assign": ["joaomoreno"]},
+		"screencast-mode": {"assign": ["joaomoreno"]},
+		"search": {"assign": ["roblourens"]},
+		"search-editor": {"assign": ["JacksonKearl"]},
+		"search-replace": {"assign": ["sandy081"]},
+		"semantic-tokens": {"assign": ["aeschli"]},
+		"settings-editor": {"assign": ["roblourens"]},
+		"settings-sync": {"assign": ["sandy081"]},
+		"simple-file-dialog": {"assign": ["alexr00"]},
+		"smart-select": {"assign": ["jrieken"]},
+		"smoke-test": {"assign": []},
+		"snap": {"assign": ["joaomoreno"]},
+		"snippets": {"assign": ["jrieken"]},
+		"splitview": {"assign": ["joaomoreno"]},
+		"suggest": {"assign": ["jrieken"]},
+		"tasks": {"assign": ["alexr00"]},
+		"telemetry": {"assign": []},
+		"themes": {"assign": ["aeschli"]},
+		"timeline": {"assign": ["eamodio"]},
+		"timeline-git": {"assign": ["eamodio"]},
+		"titlebar": {"assign": ["sbatten"]},
+		"tokenization": {"assign": []},
+		"tree": {"assign": ["joaomoreno"]},
+		"typescript": {"assign": ["mjbvz"]},
+		"undo-redo": {"assign": []},
+		"unit-test": {"assign": []},
+		"uri": {"assign": ["jrieken"]},
+		"ux": {"assign": ["misolori"]},
+		"variable-resolving": {"assign": []},
+		"vscode-build": {"assign": []},
+		"web": {"assign": ["bpasero"]},
+		"webview": {"assign": ["mjbvz"]},
+		"workbench-cli": {"assign": []},
+		"workbench-diagnostics": {"assign": ["RMacfarlane"]},
+		"workbench-dnd": {"assign": ["bpasero"]},
+		"workbench-editor-grid": {"assign": ["sbatten"]},
+		"workbench-editors": {"assign": ["bpasero"]},
+		"workbench-electron": {"assign": ["deepak1556"]},
+		"workbench-feedback": {"assign": ["bpasero"]},
+		"workbench-history": {"assign": ["bpasero"]},
+		"workbench-hot-exit": {"assign": ["Tyriar"]},
+		"workbench-launch": {"assign": []},
+		"workbench-link": {"assign": []},
+		"workbench-multiroot": {"assign": ["bpasero"]},
+		"workbench-notifications": {"assign": ["bpasero"]},
+		"workbench-os-integration": {"assign": []},
+		"workbench-rapid-render": {"assign": ["jrieken"]},
+		"workbench-run-as-admin": {"assign": []},
+		"workbench-state": {"assign": ["bpasero"]},
+		"workbench-status": {"assign": ["bpasero"]},
+		"workbench-tabs": {"assign": ["bpasero"]},
+		"workbench-touchbar": {"assign": ["bpasero"]},
+		"workbench-views": {"assign": ["sbatten"]},
+		"workbench-welcome": {"assign": ["chrmarti"]},
+		"workbench-window": {"assign": ["bpasero"]},
+		"workbench-zen": {"assign": ["isidorn"]},
+		"workspace-edit": {"assign": ["jrieken"]},
+		"workspace-symbols": {"assign": []},
+		"zoom": {"assign": ["alexdima"] }
 		}
-	}
 }
--- a/.github/commands.json
+++ b/.github/commands.json
@ -221,6 +221,19 @@
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the C++ extension. Please file it with the repository [here](https://github.com/Microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines for more information.\n\nHappy Coding!"
 	},
+	{
+		"type": "comment",
+		"name": "extCpp",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"action": "close",
+		"addLabel": "*caused-by-extension",
+		"comment": "It looks like this is caused by the C++ extension. Please file it with the repository [here](https://github.com/Microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines for more information.\n\nHappy Coding!"
+	},
 	{
 		"type": "comment",
 		"name": "extTS",
@ -271,7 +284,7 @@
 		],
 		"action": "close",
 		"addLabel": "*caused-by-extension",
-		"comment": "It looks like this is caused by the Go extension. Please file it with the repository [here](https://github.com/microsoft/vscode-go). Make sure to check their [contributing guidelines](https://github.com/microsoft/vscode-go/blob/master/CONTRIBUTING.md) and provide relevant information such as the extension version you're using. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines for more information.\n\nHappy Coding!"
+		"comment": "It looks like this is caused by the Go extension. Please file it with the repository [here](https://github.com/golang/vscode-go). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines for more information.\n\nHappy Coding!"
 	},
 	{
 		"type": "comment",
--- a/.github/workflows/author-verified.yml
+++ b/.github/workflows/author-verified.yml
@ -17,7 +17,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: 'microsoft/vscode-github-triage-actions'
-          ref: v27
+          ref: v31
          path: ./actions
      - name: Install Actions
        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'author-verification-requested')
--- a/.github/workflows/classifier-train.yml
+++ b/.github/workflows/classifier-train.yml
@ -1,40 +0,0 @@
-name: "Classifier: Trainer"
-on:
-  schedule:
-    - cron: 0 0 12 * *
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        with:
-          repository: 'microsoft/vscode-github-triage-actions'
-          ref: master
-          lfs: true
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Install Additional Dependencies
-        # Pulls in a bunch of other packages that arent needed for the rest of the actions
-        run: npm install @azure/storage-blob@12
-      - name: "Run Classifier: Scraper"
-        uses: ./actions/classifier/train/fetch-issues
-        with:
-          token: ${{secrets.ISSUE_SCRAPER_TOKEN}} # My personal token, so as to not risk going over quota on main token
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade numpy scipy scikit-learn joblib nltk
-      - name: "Run Classifier: Generator"
-        run: python ./actions/classifier/train/generate-models/generate.py category
-      - name: "Run Classifier: Upload"
-        uses: ./actions/classifier/train/upload-models
-        with:
-          blobContainerName: classifier-models
-          blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
--- a/.github/workflows/commands.yml
+++ b/.github/workflows/commands.yml
@ -13,7 +13,7 @@ jobs:
        with:
          repository: 'microsoft/vscode-github-triage-actions'
          path: ./actions
-          ref: v27
+          ref: v31
      - name: Install Actions
        run: npm install --production --prefix ./actions
      - name: Run Commands
--- a/.github/workflows/deep-classifier-monitor.yml
+++ b/.github/workflows/deep-classifier-monitor.yml
@ -0,0 +1,23 @@
+name: "Deep Classifier: Monitor"
+on:
+  issues:
+    types: [unassigned]
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: 'microsoft/vscode-github-triage-actions'
+          ref: v31
+          path: ./actions
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: "Run Classifier: Monitor"
+        uses: ./actions/classifier-deep/monitor
+        with:
+          botName: vscode-triage-bot
+          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
+          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
--- a/.github/workflows/deep-classifier-runner.yml
+++ b/.github/workflows/deep-classifier-runner.yml
@ -1,7 +1,9 @@
-name: "Classifier: Apply"
+name: "Deep Classifier: Runner"
 on:
  schedule:
-    - cron: 0,30 * * * *
+    - cron: 0/30 * * * *
+  repository_dispatch:
+    types: [trigger-deep-classifier-runner]

 jobs:
  main:
@ -11,7 +13,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: 'microsoft/vscode-github-triage-actions'
-          ref:  v22 # dont bump, we use an old classifier implementation. TODO: dont.
+          ref: v31
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions
@ -19,13 +21,16 @@ jobs:
        # Pulls in a bunch of other packages that arent needed for the rest of the actions
        run: npm install @azure/storage-blob@12
      - name: "Run Classifier: Scraper"
-        uses: ./actions/classifier/apply/fetch-issues
+        uses: ./actions/classifier-deep/apply/fetch-sources
        with:
          # slightly overlapping to protect against issues slipping through the cracks if a run is delayed
-          from: 45
+          from: 40
          until: 5
-          blobContainerName: classifier-models
+          configPath: classifier
+          blobContainerName: vscode-issue-classifier
          blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
+          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
+          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
      - name: Set up Python 3.7
        uses: actions/setup-python@v1
        with:
@ -33,11 +38,13 @@ jobs:
      - name: Install dependencies
        run: |
          python -m pip install --upgrade pip
-          pip install --upgrade numpy scipy scikit-learn joblib nltk
+          pip install --upgrade numpy scipy scikit-learn joblib nltk simpletransformers torch torchvision
      - name: "Run Classifier: Generator"
-        run: python ./actions/classifier/apply/generate-labels/main.py
+        run: python ./actions/classifier-deep/apply/generate-labels/main.py
      - name: "Run Classifier: Labeler"
-        uses: ./actions/classifier/apply/apply-labels
+        uses: ./actions/classifier-deep/apply/apply-labels
        with:
-          config-path: classifier
+          configPath: classifier
+          allowLabels: "needs more info|new release"
+          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
--- a/.github/workflows/deep-classifier-scraper.yml
+++ b/.github/workflows/deep-classifier-scraper.yml
@ -0,0 +1,27 @@
+name: "Deep Classifier: Scraper"
+on:
+  repository_dispatch:
+    types: [trigger-deep-classifier-scraper]
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: 'microsoft/vscode-github-triage-actions'
+          ref: v31
+          path: ./actions
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Install Additional Dependencies
+        # Pulls in a bunch of other packages that arent needed for the rest of the actions
+        run: npm install @azure/storage-blob@12
+      - name: "Run Classifier: Scraper"
+        uses: ./actions/classifier-deep/train/fetch-issues
+        with:
+          blobContainerName: vscode-issue-classifier
+          blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
+          token: ${{secrets.ISSUE_SCRAPER_TOKEN}}
+          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
--- a/.github/workflows/english-please.yml
+++ b/.github/workflows/english-please.yml
@ -13,7 +13,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: 'microsoft/vscode-github-triage-actions'
-          ref: v27
+          ref: v31
          path: ./actions
      - name: Install Actions
        if: contains(github.event.issue.labels.*.name, '*english-please')
--- a/.github/workflows/feature-request.yml
+++ b/.github/workflows/feature-request.yml
@ -18,7 +18,7 @@ jobs:
        with:
          repository: 'microsoft/vscode-github-triage-actions'
          path: ./actions
-          ref: v27
+          ref: v31
      - name: Install Actions
        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
        run: npm install --production --prefix ./actions
--- a/.github/workflows/latest-release-monitor.yml
+++ b/.github/workflows/latest-release-monitor.yml
@ -12,7 +12,7 @@ jobs:
        with:
          repository: 'microsoft/vscode-github-triage-actions'
          path: ./actions
-          ref: v27
+          ref: v31
      - name: Install Actions
        run: npm install --production --prefix ./actions
      - name: Install Storage Module
@ -20,6 +20,6 @@ jobs:
      - name: Run Latest Release Monitor
        uses: ./actions/latest-release-monitor
        with:
-          storageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING_NEW}}
+          storageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
--- a/.github/workflows/locker.yml
+++ b/.github/workflows/locker.yml
@ -14,7 +14,7 @@ jobs:
        with:
          repository: 'microsoft/vscode-github-triage-actions'
          path: ./actions
-          ref: v27
+          ref: v31
      - name: Install Actions
        run: npm install --production --prefix ./actions
      - name: Run Locker
--- a/.github/workflows/needs-more-info-closer.yml
+++ b/.github/workflows/needs-more-info-closer.yml
@ -14,7 +14,7 @@ jobs:
        with:
          repository: 'microsoft/vscode-github-triage-actions'
          path: ./actions
-          ref: v27
+          ref: v31
      - name: Install Actions
        run: npm install --production --prefix ./actions
      - name: Run Needs More Info Closer
--- a/.github/workflows/on-label.yml
+++ b/.github/workflows/on-label.yml
@ -11,7 +11,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: 'microsoft/vscode-github-triage-actions'
-          ref: v27
+          ref: v31
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions
--- a/.github/workflows/on-open.yml
+++ b/.github/workflows/on-open.yml
@ -11,7 +11,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: 'microsoft/vscode-github-triage-actions'
-          ref: v27
+          ref: v31
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions
@ -48,6 +48,14 @@ jobs:
          mustNotMatch: "^We have written the needed data into your clipboard because it was too large to send\\. Please paste\\.$"
          comment: "It looks like you're using the VS Code Issue Reporter but did not paste the text generated into the created issue. We've closed this issue, please open a new one containing the text we placed in your clipboard.\n\nHappy Coding!"

+      - name: Run Clipboard Labeler (Chinese)
+        uses: ./actions/regex-labeler
+        with:
+          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
+          label: "invalid"
+          mustNotMatch: "^所需的数据太大，无法直接发送。我们已经将其写入剪贴板，请粘贴。$"
+          comment: "看起来您正在使用 VS Code 问题报告程序，但是没有将生成的文本粘贴到创建的问题中。我们将关闭这个问题，请使用剪贴板中的内容创建一个新的问题。\n\n祝您使用愉快！"
+
      # source of truth in ./english-please.yml
      - name: Run English Please
        uses: ./actions/english-please
--- a/.github/workflows/release-pipeline-labeler.yml
+++ b/.github/workflows/release-pipeline-labeler.yml
@ -13,7 +13,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: 'microsoft/vscode-github-triage-actions'
-          ref: v27
+          ref: v31
          path: ./actions
      - name: Checkout Repo
        if: github.event_name != 'issues'
--- a/.github/workflows/rich-navigation.yml
+++ b/.github/workflows/rich-navigation.yml
@ -0,0 +1,23 @@
+name: "Rich Navigation Indexing"
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  richnav:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v1
+    - name: Install dependencies
+      run: yarn --frozen-lockfile
+      env:
+        CHILD_CONCURRENCY: 1
+    - uses: microsoft/RichCodeNavIndexer@master
+      with:
+        languages: typescript
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+      continue-on-error: true
--- a/.github/workflows/test-plan-item-validator.yml
+++ b/.github/workflows/test-plan-item-validator.yml
@ -14,7 +14,7 @@ jobs:
        with:
          repository: 'microsoft/vscode-github-triage-actions'
          path: ./actions
-          ref: v27
+          ref: v31
      - name: Install Actions
        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
        run: npm install --production --prefix ./actions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -26,6 +26,7 @@
 		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true,
 		"src/vs/base/test/node/uri.test.data.txt": true,
+		"src/vs/workbench/test/browser/api/extHostDocumentData.test.perf-data.ts": true,
 		"src/vs/server": false
 	},
 	"lcov.path": [
@ -72,8 +73,9 @@
 	},
 	"gulp.autoDetect": "off",
 	"files.insertFinalNewline": true,
-  "[typescript]": {
+	"[typescript]": {
 		"editor.defaultFormatter": "vscode.typescript-language-features"
 	},
-	"typescript.tsc.autoDetect": "off"
+	"typescript.tsc.autoDetect": "off",
+	"typescript.tsserver.useSeparateSyntaxServer": "dynamic"
 }
--- a/.yarnrc
+++ b/.yarnrc
@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "7.3.1"
+target "8.3.3"
 runtime "electron"
--- a/build/.webignore
+++ b/build/.webignore
@ -0,0 +1,15 @@
+# cleanup rules for web node modules, .gitignore style
+
+jschardet/src/**
+
+xterm/src/**
+
+xterm-addon-search/src/**
+xterm-addon-search/out/**
+xterm-addon-search/fixtures/**
+
+xterm-addon-unicode11/src/**
+xterm-addon-unicode11/out/**
+
+xterm-addon-webgl/src/**
+xterm-addon-webgl/out/**
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@ -94,11 +94,11 @@ steps:
  displayName: Run hygiene, monaco compile & valid layers checks
  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

- script: |
-    set -
-    ./build/azure-pipelines/common/extract-telemetry.sh
-  displayName: Extract Telemetry
-  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+# - script: |
+#     set -
+#     ./build/azure-pipelines/common/extract-telemetry.sh
+#   displayName: Extract Telemetry
+#   condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))

 - script: |
    set -e
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@ -218,7 +218,7 @@ steps:
    restoreSolution: 'build\azure-pipelines\win32\ESRPClient\packages.config'
    feedsToUse: config
    nugetConfigPath: 'build\azure-pipelines\win32\ESRPClient\NuGet.config'
-    externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b
+    externalFeedCredentials: 'ESRP Nuget'
    restoreDirectory: packages

 - task: ESRPImportCertTask@1
--- a/build/builtin/main.js
+++ b/build/builtin/main.js
@ -10,7 +10,7 @@ const path = require('path');
 let window = null;

 app.once('ready', () => {
-	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true, enableWebSQL: false } });
+	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true, enableWebSQL: false, nativeWindowOpen: true } });
 	window.setMenuBarVisibility(false);
 	window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
 	// window.webContents.openDevTools();
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@ -47,6 +47,7 @@ const nodeModules = ['electron', 'original-fs']
 const vscodeEntryPoints = _.flatten([
 	buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
 	buildfile.base,
+	buildfile.workerExtensionHost,
 	buildfile.workbenchDesktop,
 	buildfile.code
 ]);
@ -72,6 +73,7 @@ const vscodeResources = [
 	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
 	'out-build/vs/workbench/contrib/webview/browser/pre/*.js',
 	'out-build/vs/workbench/contrib/webview/electron-browser/pre/*.js',
+	'out-build/vs/workbench/services/extensions/worker/extensionHostWorkerMain.js',
 	'out-build/vs/**/markdown.css',
 	'out-build/vs/workbench/contrib/tasks/**/*.json',
 	'out-build/vs/platform/files/**/*.exe',
--- a/build/lib/eslint/vscode-dts-literal-or-types.js
+++ b/build/lib/eslint/vscode-dts-literal-or-types.js
@ -13,6 +13,10 @@ module.exports = new class ApiLiteralOrTypes {
    create(context) {
        return {
            ['TSTypeAnnotation TSUnionType TSLiteralType']: (node) => {
+                var _a;
+                if (((_a = node.literal) === null || _a === void 0 ? void 0 : _a.type) === 'TSNullKeyword') {
+                    return;
+                }
                context.report({
                    node: node,
                    messageId: 'useEnum'
--- a/build/lib/eslint/vscode-dts-literal-or-types.ts
+++ b/build/lib/eslint/vscode-dts-literal-or-types.ts
@ -15,6 +15,9 @@ export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
 			['TSTypeAnnotation TSUnionType TSLiteralType']: (node: any) => {
+				if (node.literal?.type === 'TSNullKeyword') {
+					return;
+				}
 				context.report({
 					node: node,
 					messageId: 'useEnum'
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@ -4,7 +4,7 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.packageMarketplaceExtensionsStream = exports.packageLocalWebExtensionsStream = exports.packageLocalExtensionsStream = exports.fromMarketplace = void 0;
+exports.scanBuiltinExtensions = exports.packageMarketplaceWebExtensionsStream = exports.packageMarketplaceExtensionsStream = exports.packageLocalWebExtensionsStream = exports.packageLocalExtensionsStream = exports.fromMarketplace = void 0;
 const es = require("event-stream");
 const fs = require("fs");
 const glob = require("glob");
@ -245,3 +245,47 @@ function packageMarketplaceExtensionsStream() {
        .pipe(util2.setExecutableBit(['**/*.sh']));
 }
 exports.packageMarketplaceExtensionsStream = packageMarketplaceExtensionsStream;
+function packageMarketplaceWebExtensionsStream(builtInExtensions) {
+    const extensions = builtInExtensions
+        .map(extension => {
+        const input = fromMarketplace(extension.name, extension.version, extension.metadata)
+            .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+        return updateExtensionPackageJSON(input, (data) => {
+            if (data.main) {
+                data.browser = data.main;
+            }
+            data.extensionKind = ['web'];
+            return data;
+        });
+    });
+    return es.merge(extensions);
+}
+exports.packageMarketplaceWebExtensionsStream = packageMarketplaceWebExtensionsStream;
+function scanBuiltinExtensions(extensionsRoot, forWeb) {
+    const scannedExtensions = [];
+    const extensionsFolders = fs.readdirSync(extensionsRoot);
+    for (const extensionFolder of extensionsFolders) {
+        const packageJSONPath = path.join(extensionsRoot, extensionFolder, 'package.json');
+        if (!fs.existsSync(packageJSONPath)) {
+            continue;
+        }
+        const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8'));
+        const extensionKind = packageJSON['extensionKind'] || [];
+        if (forWeb && extensionKind.indexOf('web') === -1) {
+            continue;
+        }
+        const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));
+        const packageNLS = children.filter(child => child === 'package.nls.json')[0];
+        const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0];
+        const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0];
+        scannedExtensions.push({
+            extensionPath: extensionFolder,
+            packageJSON: packageJSON,
+            packagsNLSPath: packageNLS ? path.join(extensionFolder, packageNLS) : undefined,
+            readmePath: readme ? path.join(extensionFolder, readme) : undefined,
+            changelogPath: changelog ? path.join(extensionFolder, changelog) : undefined,
+        });
+    }
+    return scannedExtensions;
+}
+exports.scanBuiltinExtensions = scanBuiltinExtensions;
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@ -78,7 +78,7 @@ function fromLocal(extensionPath: string, forWeb: boolean): Stream {
 		});
 	}

-	return minimizeLanguageJSON(input)
+	return minimizeLanguageJSON(input);
 }


@ -291,3 +291,55 @@ export function packageMarketplaceExtensionsStream(): NodeJS.ReadWriteStream {
 	return es.merge(extensions)
 		.pipe(util2.setExecutableBit(['**/*.sh']));
 }
+
+export function packageMarketplaceWebExtensionsStream(builtInExtensions: IBuiltInExtension[]): NodeJS.ReadWriteStream {
+	const extensions = builtInExtensions
+		.map(extension => {
+			const input = fromMarketplace(extension.name, extension.version, extension.metadata)
+				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+			return updateExtensionPackageJSON(input, (data: any) => {
+				if (data.main) {
+					data.browser = data.main;
+				}
+				data.extensionKind = ['web'];
+				return data;
+			});
+		});
+	return es.merge(extensions);
+}
+
+export interface IScannedBuiltinExtension {
+	extensionPath: string,
+	packageJSON: any,
+	packagsNLSPath?: string,
+	readmePath?: string,
+	changelogPath?: string,
+}
+
+export function scanBuiltinExtensions(extensionsRoot: string, forWeb: boolean): IScannedBuiltinExtension[] {
+	const scannedExtensions: IScannedBuiltinExtension[] = [];
+	const extensionsFolders = fs.readdirSync(extensionsRoot);
+	for (const extensionFolder of extensionsFolders) {
+		const packageJSONPath = path.join(extensionsRoot, extensionFolder, 'package.json');
+		if (!fs.existsSync(packageJSONPath)) {
+			continue;
+		}
+		const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8'));
+		const extensionKind: string[] = packageJSON['extensionKind'] || [];
+		if (forWeb && extensionKind.indexOf('web') === -1) {
+			continue;
+		}
+		const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));
+		const packageNLS = children.filter(child => child === 'package.nls.json')[0];
+		const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0];
+		const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0];
+		scannedExtensions.push({
+			extensionPath: extensionFolder,
+			packageJSON: packageJSON,
+			packagsNLSPath: packageNLS ? path.join(extensionFolder, packageNLS) : undefined,
+			readmePath: readme ? path.join(extensionFolder, readme) : undefined,
+			changelogPath: changelog ? path.join(extensionFolder, changelog) : undefined,
+		});
+	}
+	return scannedExtensions;
+}
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@ -16,7 +16,7 @@ const https = require("https");
 const gulp = require("gulp");
 const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
-const iconv = require("iconv-lite");
+const iconv = require("iconv-lite-umd");
 const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
 function log(message, ...rest) {
    fancyLog(ansiColors.green('[i18n]'), message, ...rest);
@ -1175,9 +1175,10 @@ function createIslFile(originalFilePath, messages, language, innoSetup) {
    });
    const basename = path.basename(originalFilePath);
    const filePath = `${basename}.${language.id}.isl`;
+    const encoded = iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage);
    return new File({
        path: filePath,
-        contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage)
+        contents: Buffer.from(encoded),
    });
 }
 function encodeEntities(value) {
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@ -218,6 +218,10 @@
 			"name": "vs/workbench/contrib/userDataSync",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/views",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/actions",
 			"project": "vscode-workbench"
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@ -15,7 +15,7 @@ import * as https from 'https';
 import * as gulp from 'gulp';
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
-import * as iconv from 'iconv-lite';
+import * as iconv from 'iconv-lite-umd';

 const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;

@ -1339,10 +1339,11 @@ function createIslFile(originalFilePath: string, messages: Map<string>, language

 	const basename = path.basename(originalFilePath);
 	const filePath = `${basename}.${language.id}.isl`;
+	const encoded = iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage);

 	return new File({
 		path: filePath,
-		contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage)
+		contents: Buffer.from(encoded),
 	});
 }

--- a/build/package.json
+++ b/build/package.json
@ -38,15 +38,15 @@
    "gulp-bom": "^1.0.0",
    "gulp-sourcemaps": "^1.11.0",
    "gulp-uglify": "^3.0.0",
-    "iconv-lite": "0.4.23",
+    "iconv-lite-umd": "0.6.3",
    "mime": "^1.3.4",
    "minimatch": "3.0.4",
    "minimist": "^1.2.3",
    "request": "^2.85.0",
    "terser": "4.3.8",
-    "typescript": "^4.0.0-dev.20200612",
+    "typescript": "^4.0.0-dev.20200622",
    "vsce": "1.48.0",
-    "vscode-telemetry-extractor": "^1.5.4",
+    "vscode-telemetry-extractor": "^1.6.0",
    "xml2js": "^0.4.17"
  },
  "scripts": {
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@ -1132,7 +1132,7 @@ begin
  end;
 end;

-// http://stackoverflow.com/a/23838239/261019
+// https://stackoverflow.com/a/23838239/261019
 procedure Explode(var Dest: TArrayOfString; Text: String; Separator: String);
 var
  i, p: Integer;
--- a/build/yarn.lock
+++ b/build/yarn.lock
@ -394,6 +394,11 @@ acorn@4.X:
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
  integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=

+agent-base@5:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
+  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
+
 ajv@^4.9.1:
  version "4.11.8"
  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
@ -845,7 +850,7 @@ debug@2.X, debug@^2.6.8:
  dependencies:
    ms "2.0.0"

-debug@^4.1.1:
+debug@4, debug@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@ -1415,12 +1420,18 @@ http-signature@~1.2.0:
    jsprim "^1.2.2"
    sshpk "^1.7.0"

-iconv-lite@0.4.23:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
+https-proxy-agent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
+  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+    agent-base "5"
+    debug "4"
+
+iconv-lite-umd@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.3.tgz#61307cab8ac29939992d0724d3ab8799467f0e97"
+  integrity sha512-fQ/8XE8reiCZ6t+SX4tX6/tQdV4tThJZv5qtMe5Sk+IWsExz0S2Zd+GiBS5IEPgDxnsmiJSpH67+qzN3FT4lKw==

 ignore@^5.1.1:
  version "5.1.2"
@ -2053,6 +2064,11 @@ process-nextick-args@~2.0.0:
  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==

+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 pump@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@ -2228,11 +2244,6 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

-"safer-buffer@>= 2.1.2 < 3":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
 sax@0.5.2:
  version "0.5.2"
  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.2.tgz#735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"
@ -2519,10 +2530,10 @@ typescript@^3.0.1:
  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==

-typescript@^4.0.0-dev.20200612:
-  version "4.0.0-dev.20200612"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200612.tgz#6f1f1a8508eae00ef79b57116886dc05051b398e"
-  integrity sha512-o69PZMHrijfGcfvPmTJjLOmYZYccfpDcpFohMmBVLZLOdtRWzjOZSfymGq1J13w6tRlvnLdREpdH40cCnhURow==
+typescript@^4.0.0-dev.20200622:
+  version "4.0.0-dev.20200622"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200622.tgz#33e0ffaf880b1f16bde5bc4eeb1863e52c4d7f75"
+  integrity sha512-KWXppG2OKfq5cDAEkc0wA7uemXnF/Af4v0j08plUCKk20rt9wYU2rU9EB53/XlVeZgV2hwpbH9hIFyeB4dWvdg==

 typical@^4.0.0:
  version "4.0.0"
@ -2654,19 +2665,22 @@ vsce@1.48.0:
    yauzl "^2.3.1"
    yazl "^2.2.2"

-vscode-ripgrep@^1.5.6:
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.7.tgz#acb6b548af488a4bca5d0f1bb5faf761343289ce"
-  integrity sha512-/Vsz/+k8kTvui0q3O74pif9FK0nKopgFTiGNVvxicZANxtSA8J8gUE9GQ/4dpi7D/2yI/YVORszwVskFbz46hQ==
+vscode-ripgrep@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.6.2.tgz#fb912c7465699f10ce0218a6676cc632c77369b4"
+  integrity sha512-jkZEWnQFcE+QuQFfxQXWcWtDafTmgkp3DjMKawDkajZwgnDlGKpFp15ybKrZNVTi1SLEF/12BzxYSZVVZ2XrkA==
+  dependencies:
+    https-proxy-agent "^4.0.0"
+    proxy-from-env "^1.1.0"

-vscode-telemetry-extractor@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/vscode-telemetry-extractor/-/vscode-telemetry-extractor-1.5.4.tgz#bcb0d17667fa1b77715e3a3bf372ade18f846782"
-  integrity sha512-MN9LNPo0Rc6cy3sIWTAG97PTWkEKdRnP0VeYoS8vjKSNtG9CAsrUxHgFfYoHm2vNK/ijd0a4NzETyVGO2kT6hw==
+vscode-telemetry-extractor@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/vscode-telemetry-extractor/-/vscode-telemetry-extractor-1.6.0.tgz#e9d9c1d24863cce8d3d715f0287de3b31eb90c56"
+  integrity sha512-zSxvkbyAMa1lTRGIHfGg7gW2e9Sey+2zGYD19uNWCsVEfoXAr2NB6uzb0sNHtbZ2SSqxSePmFXzBAavsudT5fw==
  dependencies:
    command-line-args "^5.1.1"
    ts-morph "^3.1.3"
-    vscode-ripgrep "^1.5.6"
+    vscode-ripgrep "^1.6.2"

 vso-node-api@6.1.2-preview:
  version "6.1.2-preview"
--- a/cgmanifest.json
+++ b/cgmanifest.json
@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf"
+					"commitHash": "052d3b44972e6d94ef40054d46c150b7cdd7a5d8"
 				}
 			},
 			"licenseDetail": [
@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "78.0.3904.130"
+			"version": "80.0.3987.165"
 		},
 		{
 			"component": {
@ -48,11 +48,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a"
+					"commitHash": "42cce5a9d0fd905bf4ad7a2528c36572dfb8b5ad"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "12.8.1"
+			"version": "12.13.0"
 		},
 		{
 			"component": {
@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "bc8fc0d406d32e4c02f3ec9f161deaacbe4f5989"
+					"commitHash": "87fd06bc96bce8f46ca05b8315657fd230bcac85"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "7.3.1"
+			"version": "8.3.3"
 		},
 		{
 			"component": {
--- a/extensions/cpp/cgmanifest.json
+++ b/extensions/cpp/cgmanifest.json
@ -19,7 +19,7 @@
 				"git": {
 					"name": "textmate/c.tmbundle",
 					"repositoryUrl": "https://github.com/textmate/c.tmbundle",
-					"commitHash": "9aa365882274ca52f01722f3dbb169b9539a20ee"
+					"commitHash": "60daf83b9d45329524f7847a75e9298b3aae5805"
 				}
 			},
 			"licenseDetail": [
@ -42,4 +42,4 @@
 		}
 	],
 	"version": 1
-}
+}
--- a/extensions/cpp/syntaxes/platform.tmLanguage.json
+++ b/extensions/cpp/syntaxes/platform.tmLanguage.json
--- a/extensions/css-language-features/client/src/customData.ts
+++ b/extensions/css-language-features/client/src/customData.ts
@ -76,17 +76,13 @@ function getCustomDataPathsInAllWorkspaces(): string[] {

 function getCustomDataPathsFromAllExtensions(): string[] {
 	const dataPaths: string[] = [];
-
 	for (const extension of extensions.all) {
-		const contributes = extension.packageJSON && extension.packageJSON.contributes;
-
-		if (contributes && contributes.css && contributes.css.customData && Array.isArray(contributes.css.customData)) {
-			const relativePaths: string[] = contributes.css.customData;
-			relativePaths.forEach(rp => {
+		const customData = extension.packageJSON?.contributes?.css?.customData;
+		if (Array.isArray(customData)) {
+			for (const rp of customData) {
 				dataPaths.push(joinPath(extension.extensionUri, rp).toString());
-			});
+			}
 		}
 	}
-
 	return dataPaths;
 }
--- a/extensions/css-language-features/server/src/customData.ts
+++ b/extensions/css-language-features/server/src/customData.ts
@ -29,7 +29,7 @@ function parseCSSData(source: string): ICSSDataProvider {
 	}

 	return newCSSDataProvider({
-		version: 1,
+		version: rawData.version || 1,
 		properties: rawData.properties || [],
 		atDirectives: rawData.atDirectives || [],
 		pseudoClasses: rawData.pseudoClasses || [],
--- a/extensions/extension-editing/src/extensionLinter.ts
+++ b/extensions/extension-editing/src/extensionLinter.ts
@ -16,6 +16,11 @@ import { languages, workspace, Disposable, TextDocument, Uri, Diagnostic, Range,

 const product = JSON.parse(fs.readFileSync(path.join(env.appRoot, 'product.json'), { encoding: 'utf-8' }));
 const allowedBadgeProviders: string[] = (product.extensionAllowedBadgeProviders || []).map((s: string) => s.toLowerCase());
+const allowedBadgeProvidersRegex: RegExp[] = (product.extensionAllowedBadgeProvidersRegex || []).map((r: string) => new RegExp(r));
+
+function isTrustedSVGSource(uri: Uri): boolean {
+	return allowedBadgeProviders.includes(uri.authority.toLowerCase()) || allowedBadgeProvidersRegex.some(r => r.test(uri.toString()));
+}

 const httpsRequired = localize('httpsRequired', "Images must use the HTTPS protocol.");
 const svgsNotValid = localize('svgsNotValid', "SVGs are not a valid image source.");
@ -321,7 +326,7 @@ export class ExtensionLinter {
 			diagnostics.push(new Diagnostic(range, message, DiagnosticSeverity.Warning));
 		}

-		if (endsWith(uri.path.toLowerCase(), '.svg') && allowedBadgeProviders.indexOf(uri.authority.toLowerCase()) === -1) {
+		if (endsWith(uri.path.toLowerCase(), '.svg') && !isTrustedSVGSource(uri)) {
 			const range = new Range(document.positionAt(begin), document.positionAt(end));
 			diagnostics.push(new Diagnostic(range, svgsNotValid, DiagnosticSeverity.Warning));
 		}
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@ -1871,14 +1871,14 @@
      {
        "view": "explorer",
        "contents": "%view.workbench.cloneRepository%",
-        "when": "config.git.enabled"
+        "when": "config.git.enabled && git.state == initialized"
      }
    ]
  },
  "dependencies": {
    "byline": "^5.0.0",
    "file-type": "^7.2.0",
-    "iconv-lite": "^0.4.24",
+    "iconv-lite-umd": "0.6.3",
    "jschardet": "2.1.1",
    "vscode-extension-telemetry": "0.1.1",
    "vscode-nls": "^4.0.0",
--- a/extensions/git/src/decorationProvider.ts
+++ b/extensions/git/src/decorationProvider.ts
@ -8,15 +8,15 @@ import * as path from 'path';
 import { Repository, GitResourceGroup } from './repository';
 import { Model } from './model';
 import { debounce } from './decorators';
-import { filterEvent, dispose, anyEvent, fireEvent } from './util';
+import { filterEvent, dispose, anyEvent, fireEvent, PromiseSource } from './util';
 import { GitErrorCodes, Status } from './api/git';

-type Callback = { resolve: (status: boolean) => void, reject: (err: any) => void };
-
 class GitIgnoreDecorationProvider implements DecorationProvider {

+	private static Decoration: Decoration = { priority: 3, color: new ThemeColor('gitDecoration.ignoredResourceForeground') };
+
 	readonly onDidChangeDecorations: Event<Uri[]>;
-	private queue = new Map<string, { repository: Repository; queue: Map<string, Callback>; }>();
+	private queue = new Map<string, { repository: Repository; queue: Map<string, PromiseSource<Decoration | undefined>>; }>();
 	private disposables: Disposable[] = [];

 	constructor(private model: Model) {
@ -29,32 +29,29 @@ class GitIgnoreDecorationProvider implements DecorationProvider {
 		this.disposables.push(window.registerDecorationProvider(this));
 	}

-	provideDecoration(uri: Uri): Promise<Decoration | undefined> {
+	async provideDecoration(uri: Uri): Promise<Decoration | undefined> {
 		const repository = this.model.getRepository(uri);

 		if (!repository) {
-			return Promise.resolve(undefined);
+			return;
 		}

 		let queueItem = this.queue.get(repository.root);

 		if (!queueItem) {
-			queueItem = { repository, queue: new Map<string, Callback>() };
+			queueItem = { repository, queue: new Map<string, PromiseSource<Decoration | undefined>>() };
 			this.queue.set(repository.root, queueItem);
 		}

-		return new Promise<boolean>((resolve, reject) => {
-			queueItem!.queue.set(uri.fsPath, { resolve, reject });
+		let promiseSource = queueItem.queue.get(uri.fsPath);
+
+		if (!promiseSource) {
+			promiseSource = new PromiseSource();
+			queueItem!.queue.set(uri.fsPath, promiseSource);
 			this.checkIgnoreSoon();
-		}).then(ignored => {
-			if (ignored) {
-				return <Decoration>{
-					priority: 3,
-					color: new ThemeColor('gitDecoration.ignoredResourceForeground')
-				};
-			}
-			return undefined;
-		});
+		}
+
+		return await promiseSource.promise;
 	}

 	@debounce(500)
@ -66,16 +63,16 @@ class GitIgnoreDecorationProvider implements DecorationProvider {
 			const paths = [...item.queue.keys()];

 			item.repository.checkIgnore(paths).then(ignoreSet => {
-				for (const [key, value] of item.queue.entries()) {
-					value.resolve(ignoreSet.has(key));
+				for (const [path, promiseSource] of item.queue.entries()) {
+					promiseSource.resolve(ignoreSet.has(path) ? GitIgnoreDecorationProvider.Decoration : undefined);
 				}
 			}, err => {
 				if (err.gitErrorCode !== GitErrorCodes.IsInSubmodule) {
 					console.error(err);
 				}

-				for (const [, value] of item.queue.entries()) {
-					value.reject(err);
+				for (const [, promiseSource] of item.queue.entries()) {
+					promiseSource.reject(err);
 				}
 			});
 		}
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@ -9,7 +9,7 @@ import * as os from 'os';
 import * as cp from 'child_process';
 import * as which from 'which';
 import { EventEmitter } from 'events';
-import iconv = require('iconv-lite');
+import * as iconv from 'iconv-lite-umd';
 import * as filetype from 'file-type';
 import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter } from './util';
 import { CancellationToken, Progress, Uri } from 'vscode';
--- a/extensions/git/src/util.ts
+++ b/extensions/git/src/util.ts
@ -3,7 +3,7 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import { Event, Disposable } from 'vscode';
+import { Event, Disposable, EventEmitter } from 'vscode';
 import { dirname, sep } from 'path';
 import { Readable } from 'stream';
 import { promises as fs, createReadStream } from 'fs';
@ -400,3 +400,39 @@ export class Limiter<T> {
 		}
 	}
 }
+
+type Completion<T> = { success: true, value: T } | { success: false, err: any };
+
+export class PromiseSource<T> {
+
+	private _onDidComplete = new EventEmitter<Completion<T>>();
+
+	private _promise: Promise<T> | undefined;
+	get promise(): Promise<T> {
+		if (this._promise) {
+			return this._promise;
+		}
+
+		return eventToPromise(this._onDidComplete.event).then(completion => {
+			if (completion.success) {
+				return completion.value;
+			} else {
+				throw completion.err;
+			}
+		});
+	}
+
+	resolve(value: T): void {
+		if (!this._promise) {
+			this._promise = Promise.resolve(value);
+			this._onDidComplete.fire({ success: true, value });
+		}
+	}
+
+	reject(err: any): void {
+		if (!this._promise) {
+			this._promise = Promise.reject(err);
+			this._onDidComplete.fire({ success: false, err });
+		}
+	}
+}
--- a/extensions/git/yarn.lock
+++ b/extensions/git/yarn.lock
@ -425,12 +425,10 @@ https-proxy-agent@^2.2.1:
    agent-base "^4.3.0"
    debug "^3.1.0"

-iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+iconv-lite-umd@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.3.tgz#61307cab8ac29939992d0724d3ab8799467f0e97"
+  integrity sha512-fQ/8XE8reiCZ6t+SX4tX6/tQdV4tThJZv5qtMe5Sk+IWsExz0S2Zd+GiBS5IEPgDxnsmiJSpH67+qzN3FT4lKw==

 inflight@^1.0.4:
  version "1.0.6"
@ -748,7 +746,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2:
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==

-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
--- a/extensions/github/src/extension.ts
+++ b/extensions/github/src/extension.ts
@ -11,9 +11,15 @@ import { GithubCredentialProviderManager } from './credentialProvider';

 export async function activate(context: vscode.ExtensionContext) {
 	const gitExtension = vscode.extensions.getExtension<GitExtension>('vscode.git')!.exports;
-	const gitAPI = gitExtension.getAPI(1);

-	context.subscriptions.push(...registerCommands(gitAPI));
-	context.subscriptions.push(gitAPI.registerRemoteSourceProvider(new GithubRemoteSourceProvider(gitAPI)));
-	context.subscriptions.push(new GithubCredentialProviderManager(gitAPI));
+	try {
+		const gitAPI = gitExtension.getAPI(1);
+
+		context.subscriptions.push(...registerCommands(gitAPI));
+		context.subscriptions.push(gitAPI.registerRemoteSourceProvider(new GithubRemoteSourceProvider(gitAPI)));
+		context.subscriptions.push(new GithubCredentialProviderManager(gitAPI));
+	} catch (err) {
+		console.error('Could not initialize GitHub extension');
+		console.warn(err);
+	}
 }
--- a/extensions/javascript/snippets/javascript.code-snippets
+++ b/extensions/javascript/snippets/javascript.code-snippets
@ -173,8 +173,7 @@
 	"Log to the console": {
 		"prefix": "log",
 		"body": [
-			"console.log($1);",
-			"$0"
+			"console.log($1);"
 		],
 		"description": "Log to the console"
 	},
@ -182,7 +181,6 @@
 		"prefix": "warn",
 		"body": [
 			"console.warn($1);",
-			"$0"
 		],
 		"description": "Log warning to the console"
 	},
@ -190,7 +188,6 @@
 		"prefix": "error",
 		"body": [
 			"console.error($1);",
-			"$0"
 		],
 		"description": "Log error to the console"
 	}
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@ -10,7 +10,7 @@
  "bin": {
    "vscode-json-languageserver": "./bin/vscode-json-languageserver"
  },
-  "main": "./out/jsonServerMain",
+  "main": "./out/node/jsonServerMain",
  "dependencies": {
    "jsonc-parser": "^2.2.1",
    "request-light": "^0.3.0",
--- a/extensions/markdown-language-features/media/index.js
+++ b/extensions/markdown-language-features/media/index.js
--- a/extensions/markdown-language-features/media/pre.js
+++ b/extensions/markdown-language-features/media/pre.js
--- a/extensions/markdown-language-features/webpack.config.js
+++ b/extensions/markdown-language-features/webpack.config.js
@ -21,9 +21,8 @@ module.exports = {
 	resolve: {
 		extensions: ['.tsx', '.ts', '.js']
 	},
-	devtool: 'inline-source-map',
 	output: {
 		filename: '[name].js',
 		path: path.resolve(__dirname, 'media')
 	}
-};
+};
--- a/extensions/npm/extension-browser.webpack.config.js
+++ b/extensions/npm/extension-browser.webpack.config.js
@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+const path = require('path');
+
+const clientConfig = withDefaults({
+	target: 'webworker',
+	context: __dirname,
+	entry: {
+		extension: './src/npmBrowserMain.ts'
+	},
+	output: {
+		filename: 'npmBrowserMain.js'
+	},
+	performance: {
+		hints: false
+	},
+	resolve: {
+		alias: {
+			'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js')
+		}
+	},
+	node: {
+		'child_process': 'empty'
+	}
+});
+clientConfig.module.rules[0].use.shift(); // remove nls loader
+
+module.exports = clientConfig;
--- a/extensions/npm/extension.webpack.config.js
+++ b/extensions/npm/extension.webpack.config.js
@ -14,12 +14,10 @@ const withDefaults = require('../shared.webpack.config');
 module.exports = withDefaults({
 	context: __dirname,
 	entry: {
-		extension: './src/main.ts',
+		extension: './src/npmMain.ts',
 	},
 	output: {
-		filename: 'main.js',
-		path: path.join(__dirname, 'dist'),
-		libraryTarget: 'commonjs',
+		filename: 'npmMain.js',
 	},
 	resolve: {
 		mainFields: ['module', 'main'],
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@ -20,14 +20,15 @@
  "dependencies": {
    "jsonc-parser": "^2.2.1",
    "minimatch": "^3.0.4",
-    "request-light": "^0.2.5",
+    "request-light": "^0.4.0",
    "vscode-nls": "^4.1.1"
  },
  "devDependencies": {
    "@types/minimatch": "^3.0.3",
    "@types/node": "^12.11.7"
  },
-  "main": "./out/main",
+  "main": "./out/npmMain",
+  "browser": "./dist/npmBrowserMain",
  "activationEvents": [
    "onCommand:workbench.action.tasks.runTask",
    "onCommand:npm.runScriptFromFolder",
@ -181,12 +182,12 @@
        }
      ],
      "explorer/context": [
-				{
-					"when": "config.npm.enableRunFromFolder && explorerViewletVisible && explorerResourceIsFolder",
+        {
+          "when": "config.npm.enableRunFromFolder && explorerViewletVisible && explorerResourceIsFolder",
          "command": "npm.runScriptFromFolder",
-					"group": "2_workspace"
-				}
-			]
+          "group": "2_workspace"
+        }
+      ]
    },
    "configuration": {
      "id": "npm",
--- a/extensions/npm/src/features/bowerJSONContribution.ts
+++ b/extensions/npm/src/features/bowerJSONContribution.ts
@ -3,11 +3,10 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace } from 'vscode';
+import { MarkdownString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace } from 'vscode';
 import { IJSONContribution, ISuggestionsCollector } from './jsonContributions';
 import { XHRRequest } from 'request-light';
 import { Location } from 'jsonc-parser';
-import { textToMarkedString } from './markedTextUtil';

 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
@ -181,13 +180,15 @@ export class BowerJSONContribution implements IJSONContribution {
 		});
 	}

-	public getInfoContribution(_resource: string, location: Location): Thenable<MarkedString[] | null> | null {
+	public getInfoContribution(_resource: string, location: Location): Thenable<MarkdownString[] | null> | null {
 		if ((location.matches(['dependencies', '*']) || location.matches(['devDependencies', '*']))) {
 			const pack = location.path[location.path.length - 1];
 			if (typeof pack === 'string') {
 				return this.getInfo(pack).then(documentation => {
 					if (documentation) {
-						return [textToMarkedString(documentation)];
+						const str = new MarkdownString();
+						str.appendText(documentation);
+						return [str];
 					}
 					return null;
 				});
--- a/extensions/npm/src/features/jsonContributions.ts
+++ b/extensions/npm/src/features/jsonContributions.ts
@ -30,8 +30,8 @@ export interface IJSONContribution {
 	resolveSuggestion?(item: CompletionItem): Thenable<CompletionItem | null> | null;
 }

-export function addJSONProviders(xhr: XHRRequest): Disposable {
-	const contributions = [new PackageJSONContribution(xhr), new BowerJSONContribution(xhr)];
+export function addJSONProviders(xhr: XHRRequest, canRunNPM: boolean): Disposable {
+	const contributions = [new PackageJSONContribution(xhr, canRunNPM), new BowerJSONContribution(xhr)];
 	const subscriptions: Disposable[] = [];
 	contributions.forEach(contribution => {
 		const selector = contribution.getDocumentSelector();
--- a/extensions/npm/src/features/packageJSONContribution.ts
+++ b/extensions/npm/src/features/packageJSONContribution.ts
@ -3,11 +3,10 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace } from 'vscode';
+import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace, MarkdownString } from 'vscode';
 import { IJSONContribution, ISuggestionsCollector } from './jsonContributions';
 import { XHRRequest } from 'request-light';
 import { Location } from 'jsonc-parser';
-import { textToMarkedString } from './markedTextUtil';

 import * as cp from 'child_process';
 import * as nls from 'vscode-nls';
@ -28,14 +27,12 @@ export class PackageJSONContribution implements IJSONContribution {
 		'jsdom', 'stylus', 'when', 'readable-stream', 'aws-sdk', 'concat-stream', 'chai', 'Thenable', 'wrench'];

 	private knownScopes = ['@types', '@angular', '@babel', '@nuxtjs', '@vue', '@bazel'];
-	private xhr: XHRRequest;

 	public getDocumentSelector(): DocumentSelector {
 		return [{ language: 'json', scheme: '*', pattern: '**/package.json' }];
 	}

-	public constructor(xhr: XHRRequest) {
-		this.xhr = xhr;
+	public constructor(private xhr: XHRRequest, private canRunNPM: boolean) {
 	}

 	public collectDefaultSuggestions(_fileName: string, result: ISuggestionsCollector): Thenable<any> {
@ -191,23 +188,23 @@ export class PackageJSONContribution implements IJSONContribution {
 			const currentKey = location.path[location.path.length - 1];
 			if (typeof currentKey === 'string') {
 				const info = await this.fetchPackageInfo(currentKey);
-				if (info && info.distTagsLatest) {
+				if (info && info.version) {

-					let name = JSON.stringify(info.distTagsLatest);
+					let name = JSON.stringify(info.version);
 					let proposal = new CompletionItem(name);
 					proposal.kind = CompletionItemKind.Property;
 					proposal.insertText = name;
 					proposal.documentation = localize('json.npm.latestversion', 'The currently latest version of the package');
 					result.add(proposal);

-					name = JSON.stringify('^' + info.distTagsLatest);
+					name = JSON.stringify('^' + info.version);
 					proposal = new CompletionItem(name);
 					proposal.kind = CompletionItemKind.Property;
 					proposal.insertText = name;
 					proposal.documentation = localize('json.npm.majorversion', 'Matches the most recent major version (1.x.x)');
 					result.add(proposal);

-					name = JSON.stringify('~' + info.distTagsLatest);
+					name = JSON.stringify('~' + info.version);
 					proposal = new CompletionItem(name);
 					proposal.kind = CompletionItemKind.Property;
 					proposal.insertText = name;
@ -219,14 +216,27 @@ export class PackageJSONContribution implements IJSONContribution {
 		return null;
 	}

+	private getDocumentation(description: string | undefined, version: string | undefined, homepage: string | undefined): MarkdownString {
+		const str = new MarkdownString();
+		if (description) {
+			str.appendText(description);
+		}
+		if (version) {
+			str.appendText('\n\n');
+			str.appendText(localize('json.npm.version.hover', 'Latest version: {0}', version));
+		}
+		if (homepage) {
+			str.appendText('\n\n');
+			str.appendText(homepage);
+		}
+		return str;
+	}
+
 	public resolveSuggestion(item: CompletionItem): Thenable<CompletionItem | null> | null {
-		if (item.kind === CompletionItemKind.Property && item.documentation === '') {
-			return this.getInfo(item.label).then(infos => {
-				if (infos.length > 0) {
-					item.documentation = infos[0];
-					if (infos.length > 1) {
-						item.detail = infos[1];
-					}
+		if (item.kind === CompletionItemKind.Property && !item.documentation) {
+			return this.fetchPackageInfo(item.label).then(info => {
+				if (info) {
+					item.documentation = this.getDocumentation(info.description, info.version, info.homepage);
 					return item;
 				}
 				return null;
@ -235,21 +245,11 @@ export class PackageJSONContribution implements IJSONContribution {
 		return null;
 	}

-	private async getInfo(pack: string): Promise<string[]> {
-		let info = await this.fetchPackageInfo(pack);
-		if (info) {
-			const result: string[] = [];
-			result.push(info.description || '');
-			result.push(info.distTagsLatest ? localize('json.npm.version.hover', 'Latest version: {0}', info.distTagsLatest) : '');
-			result.push(info.homepage || '');
-			return result;
-		}
-
-		return [];
-	}
-
 	private async fetchPackageInfo(pack: string): Promise<ViewPackageInfo | undefined> {
-		let info = await this.npmView(pack);
+		let info: ViewPackageInfo | undefined;
+		if (this.canRunNPM) {
+			info = await this.npmView(pack);
+		}
 		if (!info) {
 			info = await this.npmjsView(pack);
 		}
@ -259,14 +259,14 @@ export class PackageJSONContribution implements IJSONContribution {

 	private npmView(pack: string): Promise<ViewPackageInfo | undefined> {
 		return new Promise((resolve, _reject) => {
-			const command = 'npm view --json ' + pack + ' description dist-tags.latest homepage';
+			const command = 'npm view --json ' + pack + ' description dist-tags.latest homepage version';
 			cp.exec(command, (error, stdout) => {
 				if (!error) {
 					try {
 						const content = JSON.parse(stdout);
 						resolve({
 							description: content['description'],
-							distTagsLatest: content['dist-tags.latest'],
+							version: content['dist-tags.latest'] || content['version'],
 							homepage: content['homepage']
 						});
 						return;
@ -280,22 +280,20 @@ export class PackageJSONContribution implements IJSONContribution {
 	}

 	private async npmjsView(pack: string): Promise<ViewPackageInfo | undefined> {
-		const queryUrl = 'https://registry.npmjs.org/' + encodeURIComponent(pack).replace(/%40/g, '@');
+		const queryUrl = 'https://api.npms.io/v2/package/' + encodeURIComponent(pack);
 		try {
 			const success = await this.xhr({
 				url: queryUrl,
 				agent: USER_AGENT
 			});
 			const obj = JSON.parse(success.responseText);
-			if (obj) {
-				const latest = obj && obj['dist-tags'] && obj['dist-tags']['latest'];
-				if (latest) {
-					return {
-						description: obj.description || '',
-						distTagsLatest: latest,
-						homepage: obj.homepage || ''
-					};
-				}
+			const metadata = obj?.collected?.metadata;
+			if (metadata) {
+				return {
+					description: metadata.description || '',
+					version: metadata.version,
+					homepage: metadata.links?.homepage || ''
+				};
 			}
 		}
 		catch (e) {
@ -308,9 +306,9 @@ export class PackageJSONContribution implements IJSONContribution {
 		if ((location.matches(['dependencies', '*']) || location.matches(['devDependencies', '*']) || location.matches(['optionalDependencies', '*']) || location.matches(['peerDependencies', '*']))) {
 			const pack = location.path[location.path.length - 1];
 			if (typeof pack === 'string') {
-				return this.getInfo(pack).then(infos => {
-					if (infos.length) {
-						return [infos.map(textToMarkedString).join('\n\n')];
+				return this.fetchPackageInfo(pack).then(info => {
+					if (info) {
+						return [this.getDocumentation(info.description, info.version, info.homepage)];
 					}
 					return null;
 				});
@ -339,7 +337,7 @@ export class PackageJSONContribution implements IJSONContribution {
 			proposal.kind = CompletionItemKind.Property;
 			proposal.insertText = insertText;
 			proposal.filterText = JSON.stringify(name);
-			proposal.documentation = pack.description || '';
+			proposal.documentation = this.getDocumentation(pack.description, pack.version, pack?.links?.homepage);
 			collector.add(proposal);
 		}
 	}
@ -349,10 +347,11 @@ interface SearchPackageInfo {
 	name: string;
 	description?: string;
 	version?: string;
+	links?: { homepage?: string; };
 }

 interface ViewPackageInfo {
 	description: string;
-	distTagsLatest?: string;
+	version?: string;
 	homepage?: string;
 }
--- a/extensions/npm/src/npmBrowserMain.ts
+++ b/extensions/npm/src/npmBrowserMain.ts
@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as httpRequest from 'request-light';
+import * as vscode from 'vscode';
+import { addJSONProviders } from './features/jsonContributions';
+
+export async function activate(context: vscode.ExtensionContext): Promise<void> {
+	context.subscriptions.push(addJSONProviders(httpRequest.xhr, false));
+}
+
+export function deactivate(): void {
+}
--- a/extensions/npm/src/npmMain.ts
+++ b/extensions/npm/src/npmMain.ts
@ -14,13 +14,19 @@ import { invalidateHoverScriptsCache, NpmScriptHoverProvider } from './scriptHov
 let treeDataProvider: NpmScriptsTreeDataProvider | undefined;

 export async function activate(context: vscode.ExtensionContext): Promise<void> {
-	registerTaskProvider(context);
-	treeDataProvider = registerExplorer(context);
-	registerHoverProvider(context);
-
 	configureHttpRequest();
-	let d = vscode.workspace.onDidChangeConfiguration((e) => {
-		configureHttpRequest();
+	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(e => {
+		if (e.affectsConfiguration('http.proxy') || e.affectsConfiguration('http.proxyStrictSSL')) {
+			configureHttpRequest();
+		}
+	}));
+
+	const canRunNPM = canRunNpmInCurrentWorkspace();
+	context.subscriptions.push(addJSONProviders(httpRequest.xhr, canRunNPM));
+
+	treeDataProvider = registerExplorer(context);
+
+	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration((e) => {
 		if (e.affectsConfiguration('npm.exclude') || e.affectsConfiguration('npm.autoDetect')) {
 			invalidateTasksCache();
 			if (treeDataProvider) {
@ -32,15 +38,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 				treeDataProvider.refresh();
 			}
 		}
-	});
-	context.subscriptions.push(d);
+	}));
+
+	registerTaskProvider(context);
+	registerHoverProvider(context);

-	d = vscode.workspace.onDidChangeTextDocument((e) => {
-		invalidateHoverScriptsCache(e.document);
-	});
-	context.subscriptions.push(d);
 	context.subscriptions.push(vscode.commands.registerCommand('npm.runSelectedScript', runSelectedScript));
-	context.subscriptions.push(addJSONProviders(httpRequest.xhr));

 	if (await hasPackageJson()) {
 		vscode.commands.executeCommand('setContext', 'npm:showScriptExplorer', true);
@ -49,6 +52,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	context.subscriptions.push(vscode.commands.registerCommand('npm.runScriptFromFolder', selectAndRunScriptFromFolder));
 }

+function canRunNpmInCurrentWorkspace() {
+	if (vscode.workspace.workspaceFolders) {
+		return vscode.workspace.workspaceFolders.some(f => f.uri.scheme === 'file');
+	}
+	return false;
+}
+
 function registerTaskProvider(context: vscode.ExtensionContext): vscode.Disposable | undefined {

 	function invalidateScriptCaches() {
--- a/extensions/npm/src/scriptHover.ts
+++ b/extensions/npm/src/scriptHover.ts
@ -32,6 +32,9 @@ export class NpmScriptHoverProvider implements HoverProvider {
 	constructor(context: ExtensionContext) {
 		context.subscriptions.push(commands.registerCommand('npm.runScriptFromHover', this.runScriptFromHover, this));
 		context.subscriptions.push(commands.registerCommand('npm.debugScriptFromHover', this.debugScriptFromHover, this));
+		context.subscriptions.push(workspace.onDidChangeTextDocument((e) => {
+			invalidateHoverScriptsCache(e.document);
+		}));
 	}

 	public provideHover(document: TextDocument, position: Position, _token: CancellationToken): ProviderResult<Hover> {
--- a/extensions/npm/yarn.lock
+++ b/extensions/npm/yarn.lock
@ -71,7 +71,7 @@ http-proxy-agent@^2.1.0:
    agent-base "4"
    debug "3.1.0"

-https-proxy-agent@^2.2.3:
+https-proxy-agent@^2.2.4:
  version "2.2.4"
  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
@ -96,16 +96,21 @@ ms@2.0.0:
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

-request-light@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.5.tgz#38a3da7b2e56f7af8cbba57e8a94930ee2380746"
-  integrity sha512-eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw==
+request-light@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.4.0.tgz#c6b91ef00b18cb0de75d2127e55b3a2c9f7f90f9"
+  integrity sha512-fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA==
  dependencies:
    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.3"
-    vscode-nls "^4.1.1"
+    https-proxy-agent "^2.2.4"
+    vscode-nls "^4.1.2"

 vscode-nls@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
  integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
+
+vscode-nls@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
+  integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==
--- a/extensions/package.json
+++ b/extensions/package.json
@ -3,7 +3,7 @@
  "version": "0.0.1",
  "description": "Dependencies shared by all extensions",
  "dependencies": {
-    "typescript": "3.9.4"
+    "typescript": "3.9.5"
  },
  "scripts": {
    "postinstall": "node ./postinstall"
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@ -39,7 +39,7 @@
 					],
 					"default": null,
 					"description": "%configuration.validate.executablePath%",
-					"scope": "machine"
+					"scope": "machine-overridable"
 				},
 				"php.validate.run": {
 					"type": "string",
--- a/extensions/sql/cgmanifest.json
+++ b/extensions/sql/cgmanifest.json
@ -6,7 +6,7 @@
 				"git": {
 					"name": "Microsoft/vscode-mssql",
 					"repositoryUrl": "https://github.com/Microsoft/vscode-mssql",
-					"commitHash": "37a22725186b5b481b2882a78c7b9fe024c13946"
+					"commitHash": "750d30dc48c4c0317b63bb5f1ed3e71487bb84a1"
 				}
 			},
 			"license": "MIT",
--- 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/37a22725186b5b481b2882a78c7b9fe024c13946",
+	"version": "https://github.com/Microsoft/vscode-mssql/commit/750d30dc48c4c0317b63bb5f1ed3e71487bb84a1",
 	"name": "SQL",
 	"scopeName": "source.sql",
 	"patterns": [
@ -404,7 +404,7 @@
 						}
 					},
 					"comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
-					"match": "(N)?(')(?:[^'\\\\]|\\\\.)*(')",
+					"match": "(N)?(')[^']*(')",
 					"name": "string.quoted.single.sql"
 				},
 				{
@ -437,7 +437,7 @@
 						}
 					},
 					"comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
-					"match": "(`)(?:[^`\\\\]|\\\\.)*(`)",
+					"match": "(`)[^`\\\\]*(`)",
 					"name": "string.quoted.other.backtick.sql"
 				},
 				{
@ -470,7 +470,7 @@
 						}
 					},
 					"comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
-					"match": "(\")(?:[^\"#\\\\]|\\\\.)*(\")",
+					"match": "(\")[^\"#]*(\")",
 					"name": "string.quoted.double.sql"
 				},
 				{
--- a/extensions/typescript-language-features/src/features/callHierarchy.ts
+++ b/extensions/typescript-language-features/src/features/callHierarchy.ts
@ -11,6 +11,13 @@ import { VersionDependentRegistration } from '../utils/dependentRegistration';
 import type * as Proto from '../protocol';
 import * as path from 'path';
 import * as PConst from '../protocol.const';
+import { parseKindModifier } from '../utils/modifiers';
+
+namespace Experimental {
+	export interface CallHierarchyItem extends Proto.CallHierarchyItem {
+		readonly kindModifiers?: string;
+	}
+}

 class TypeScriptCallHierarchySupport implements vscode.CallHierarchyProvider {
 	public static readonly minVersion = API.v380;
@ -75,11 +82,11 @@ function isSourceFileItem(item: Proto.CallHierarchyItem) {
 	return item.kind === PConst.Kind.script || item.kind === PConst.Kind.module && item.selectionSpan.start.line === 1 && item.selectionSpan.start.offset === 1;
 }

-function fromProtocolCallHierarchyItem(item: Proto.CallHierarchyItem): vscode.CallHierarchyItem {
+function fromProtocolCallHierarchyItem(item: Experimental.CallHierarchyItem): vscode.CallHierarchyItem {
 	const useFileName = isSourceFileItem(item);
 	const name = useFileName ? path.basename(item.file) : item.name;
 	const detail = useFileName ? vscode.workspace.asRelativePath(path.dirname(item.file)) : '';
-	return new vscode.CallHierarchyItem(
+	const result = new vscode.CallHierarchyItem(
 		typeConverters.SymbolKind.fromProtocolScriptElementKind(item.kind),
 		name,
 		detail,
@ -87,6 +94,12 @@ function fromProtocolCallHierarchyItem(item: Proto.CallHierarchyItem): vscode.Ca
 		typeConverters.Range.fromTextSpan(item.span),
 		typeConverters.Range.fromTextSpan(item.selectionSpan)
 	);
+
+	const kindModifiers = item.kindModifiers ? parseKindModifier(item.kindModifiers) : undefined;
+	if (kindModifiers?.has(PConst.KindModifiers.depreacted)) {
+		result.tags = [vscode.SymbolTag.Deprecated];
+	}
+	return result;
 }

 function fromProtocolCallHierchyIncomingCall(item: Proto.CallHierarchyIncomingCall): vscode.CallHierarchyIncomingCall {
--- a/extensions/typescript-language-features/src/features/completions.ts
+++ b/extensions/typescript-language-features/src/features/completions.ts
@ -19,6 +19,7 @@ import { TelemetryReporter } from '../utils/telemetry';
 import * as typeConverters from '../utils/typeConverters';
 import TypingsStatus from '../utils/typingsStatus';
 import FileConfigurationManager from './fileConfigurationManager';
+import { parseKindModifier } from '../utils/modifiers';

 const localize = nls.loadMessageBundle();

@ -90,8 +91,8 @@ class MyCompletionItem extends vscode.CompletionItem {
 		}

 		if (tsEntry.kindModifiers) {
-			const kindModifiers = tsEntry.kindModifiers.split(/,|\s+/g);
-			if (kindModifiers.includes(PConst.KindModifiers.optional)) {
+			const kindModifiers = parseKindModifier(tsEntry.kindModifiers);
+			if (kindModifiers.has(PConst.KindModifiers.optional)) {
 				if (!this.insertText) {
 					this.insertText = this.label;
 				}
@ -101,14 +102,17 @@ class MyCompletionItem extends vscode.CompletionItem {
 				}
 				this.label += '?';
 			}
+			if (kindModifiers.has(PConst.KindModifiers.depreacted)) {
+				this.tags = [vscode.CompletionItemTag.Deprecated];
+			}

-			if (kindModifiers.includes(PConst.KindModifiers.color)) {
+			if (kindModifiers.has(PConst.KindModifiers.color)) {
 				this.kind = vscode.CompletionItemKind.Color;
 			}

 			if (tsEntry.kind === PConst.Kind.script) {
 				for (const extModifier of PConst.KindModifiers.fileExtensionKindModifiers) {
-					if (kindModifiers.includes(extModifier)) {
+					if (kindModifiers.has(extModifier)) {
 						if (tsEntry.name.toLowerCase().endsWith(extModifier)) {
 							this.detail = tsEntry.name;
 						} else {
--- a/extensions/typescript-language-features/src/features/diagnostics.ts
+++ b/extensions/typescript-language-features/src/features/diagnostics.ts
@ -78,7 +78,7 @@ class FileDiagnostics {
 		return this.get(DiagnosticKind.Suggestion).filter(x => {
 			if (!enableSuggestions) {
 				// Still show unused
-				return x.tags && x.tags.includes(vscode.DiagnosticTag.Unnecessary);
+				return x.tags && (x.tags.includes(vscode.DiagnosticTag.Unnecessary) || x.tags.includes(vscode.DiagnosticTag.Deprecated));
 			}
 			return true;
 		});
--- a/extensions/typescript-language-features/src/features/documentSymbol.ts
+++ b/extensions/typescript-language-features/src/features/documentSymbol.ts
@ -9,6 +9,7 @@ import * as PConst from '../protocol.const';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import * as typeConverters from '../utils/typeConverters';
 import { CachedResponse } from '../tsServer/cachedResponse';
+import { parseKindModifier } from '../utils/modifiers';

 const getSymbolKind = (kind: string): vscode.SymbolKind => {
 	switch (kind) {
@ -79,6 +80,12 @@ class TypeScriptDocumentSymbolProvider implements vscode.DocumentSymbolProvider
 				range,
 				range.contains(selectionRange) ? selectionRange : range);

+
+			const kindModifiers = parseKindModifier(item.kindModifiers);
+			if (kindModifiers.has(PConst.KindModifiers.depreacted)) {
+				symbolInfo.tags = [vscode.SymbolTag.Deprecated];
+			}
+
 			for (const child of children) {
 				if (child.spans.some(span => !!range.intersection(typeConverters.Range.fromTextSpan(span)))) {
 					const includedChild = TypeScriptDocumentSymbolProvider.convertNavTree(resource, symbolInfo.children, child);
--- a/extensions/typescript-language-features/src/features/languageConfiguration.ts
+++ b/extensions/typescript-language-features/src/features/languageConfiguration.ts
@ -31,7 +31,7 @@ const jsTsLanguageConfiguration: vscode.LanguageConfiguration = {
 		}, {
 			// e.g.  * ...|
 			beforeText: /^(\t|[ ])*[ ]\*([ ]([^\*]|\*(?!\/))*)?$/,
-			oneLineAboveText: /^(\s*(\/\*\*|\*)).*/,
+			oneLineAboveText: /(?=^(\s*(\/\*\*|\*)).*)(?=(?!(\s*\*\/)))/,
 			action: { indentAction: vscode.IndentAction.None, appendText: '* ' },
 		}, {
 			// e.g.  */|
--- a/extensions/typescript-language-features/src/features/workspaceSymbols.ts
+++ b/extensions/typescript-language-features/src/features/workspaceSymbols.ts
@ -11,6 +11,7 @@ import API from '../utils/api';
 import * as fileSchemes from '../utils/fileSchemes';
 import { doesResourceLookLikeAJavaScriptFile, doesResourceLookLikeATypeScriptFile } from '../utils/languageDescription';
 import * as typeConverters from '../utils/typeConverters';
+import { parseKindModifier } from '../utils/modifiers';

 function getSymbolKind(item: Proto.NavtoItem): vscode.SymbolKind {
 	switch (item.kind) {
@ -90,11 +91,16 @@ class TypeScriptWorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvide

 	private toSymbolInformation(item: Proto.NavtoItem) {
 		const label = TypeScriptWorkspaceSymbolProvider.getLabel(item);
-		return new vscode.SymbolInformation(
+		const info = new vscode.SymbolInformation(
 			label,
 			getSymbolKind(item),
 			item.containerName || '',
 			typeConverters.Location.fromTextSpan(this.client.toResource(item.file), item));
+		const kindModifiers = item.kindModifiers ? parseKindModifier(item.kindModifiers) : undefined;
+		if (kindModifiers?.has(PConst.KindModifiers.depreacted)) {
+			info.tags = [vscode.SymbolTag.Deprecated];
+		}
+		return info;
 	}

 	private static getLabel(item: Proto.NavtoItem) {
--- a/extensions/typescript-language-features/src/languageProvider.ts
+++ b/extensions/typescript-language-features/src/languageProvider.ts
@ -122,16 +122,22 @@ export default class LanguageProvider extends Disposable {
 		this.client.bufferSyncSupport.requestAllDiagnostics();
 	}

-	public diagnosticsReceived(diagnosticsKind: DiagnosticKind, file: vscode.Uri, diagnostics: (vscode.Diagnostic & { reportUnnecessary: any })[]): void {
+	public diagnosticsReceived(diagnosticsKind: DiagnosticKind, file: vscode.Uri, diagnostics: (vscode.Diagnostic & { reportUnnecessary: any, reportDeprecated: any })[]): void {
 		const config = vscode.workspace.getConfiguration(this.id, file);
 		const reportUnnecessary = config.get<boolean>('showUnused', true);
+		const reportDeprecated = config.get<boolean>('showDeprecated', true);
 		this.client.diagnosticsManager.updateDiagnostics(file, this._diagnosticLanguage, diagnosticsKind, diagnostics.filter(diag => {
+			// Don't both reporting diagnostics we know will not be rendered
 			if (!reportUnnecessary) {
-				diag.tags = undefined;
 				if (diag.reportUnnecessary && diag.severity === vscode.DiagnosticSeverity.Hint) {
 					return false;
 				}
 			}
+			if (!reportDeprecated) {
+				if (diag.reportDeprecated && diag.severity === vscode.DiagnosticSeverity.Hint) {
+					return false;
+				}
+			}
 			return true;
 		}));
 	}
--- a/extensions/typescript-language-features/src/protocol.const.ts
+++ b/extensions/typescript-language-features/src/protocol.const.ts
@ -45,6 +45,7 @@ export class DiagnosticCategory {

 export class KindModifiers {
 	public static readonly optional = 'optional';
+	public static readonly depreacted = 'deprecated';
 	public static readonly color = 'color';

 	public static readonly dtsFile = '.d.ts';
--- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
+++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
@ -26,6 +26,12 @@ import * as typeConverters from './utils/typeConverters';
 import TypingsStatus, { AtaProgressReporter } from './utils/typingsStatus';
 import VersionStatus from './utils/versionStatus';

+namespace Experimental {
+	export interface Diagnostic extends Proto.Diagnostic {
+		readonly reportsDeprecated?: {}
+	}
+}
+
 // Style check diagnostics that can be reported as warnings
 const styleCheckDiagnostics = new Set([
 	...errorCodes.variableDeclaredButNeverUsed,
@ -233,11 +239,11 @@ export default class TypeScriptServiceClientHost extends Disposable {
 	private createMarkerDatas(
 		diagnostics: Proto.Diagnostic[],
 		source: string
-	): (vscode.Diagnostic & { reportUnnecessary: any })[] {
+	): (vscode.Diagnostic & { reportUnnecessary: any, reportDeprecated: any })[] {
 		return diagnostics.map(tsDiag => this.tsDiagnosticToVsDiagnostic(tsDiag, source));
 	}

-	private tsDiagnosticToVsDiagnostic(diagnostic: Proto.Diagnostic, source: string): vscode.Diagnostic & { reportUnnecessary: any } {
+	private tsDiagnosticToVsDiagnostic(diagnostic: Experimental.Diagnostic, source: string): vscode.Diagnostic & { reportUnnecessary: any, reportDeprecated: any } {
 		const { start, end, text } = diagnostic;
 		const range = new vscode.Range(typeConverters.Position.fromLocation(start), typeConverters.Position.fromLocation(end));
 		const converted = new vscode.Diagnostic(range, text, this.getDiagnosticSeverity(diagnostic));
@ -255,11 +261,19 @@ export default class TypeScriptServiceClientHost extends Disposable {
 				return new vscode.DiagnosticRelatedInformation(typeConverters.Location.fromTextSpan(this.client.toResource(span.file), span), info.message);
 			}));
 		}
+		const tags: vscode.DiagnosticTag[] = [];
 		if (diagnostic.reportsUnnecessary) {
-			converted.tags = [vscode.DiagnosticTag.Unnecessary];
+			tags.push(vscode.DiagnosticTag.Unnecessary);
 		}
-		(converted as vscode.Diagnostic & { reportUnnecessary: any }).reportUnnecessary = diagnostic.reportsUnnecessary;
-		return converted as vscode.Diagnostic & { reportUnnecessary: any };
+		if (diagnostic.reportsDeprecated) {
+			tags.push(vscode.DiagnosticTag.Deprecated);
+		}
+		converted.tags = tags.length ? tags : undefined;
+
+		const resultConverted = converted as vscode.Diagnostic & { reportUnnecessary: any, reportDeprecated: any };
+		resultConverted.reportUnnecessary = diagnostic.reportsUnnecessary;
+		resultConverted.reportDeprecated = diagnostic.reportsDeprecated;
+		return resultConverted;
 	}

 	private getDiagnosticSeverity(diagnostic: Proto.Diagnostic): vscode.DiagnosticSeverity {
--- a/extensions/typescript-language-features/src/utils/modifiers.ts
+++ b/extensions/typescript-language-features/src/utils/modifiers.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 parseKindModifier(kindModifiers: string): Set<string> {
+	return new Set(kindModifiers.split(/,|\s+/g));
+}
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
@ -22,6 +22,8 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
 		await config.update('windowsEnableConpty', false, ConfigurationTarget.Global);
 		// Disable exit alerts as tests may trigger then and we're not testing the notifications
 		await config.update('showExitAlert', false, ConfigurationTarget.Global);
+		// Canvas may cause problems when running in a container
+		await config.update('rendererType', 'dom', ConfigurationTarget.Global);
 	});

 	suite('Terminal', () => {
@ -47,7 +49,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
 			doesNotThrow(terminal.sendText.bind(terminal, 'echo "foo"'));
 		});

-		test('echo works in the default shell', (done) => {
+		(process.platform === 'linux' ? test.skip : test)('echo works in the default shell', (done) => {
 			disposables.push(window.onDidOpenTerminal(term => {
 				try {
 					equal(terminal, term);
@ -67,7 +69,9 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
 					if (data.indexOf(expected) !== 0) {
 						dataDisposable.dispose();
 						terminal.dispose();
-						disposables.push(window.onDidCloseTerminal(() => done()));
+						disposables.push(window.onDidCloseTerminal(() => {
+							done();
+						}));
 					}
 				});
 				disposables.push(dataDisposable);
--- a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/

 import * as assert from 'assert';
-import { workspace, window, commands, ViewColumn, TextEditorViewColumnChangeEvent, Uri, Selection, Position, CancellationTokenSource, TextEditorSelectionChangeKind } from 'vscode';
+import { workspace, window, commands, ViewColumn, TextEditorViewColumnChangeEvent, Uri, Selection, Position, CancellationTokenSource, TextEditorSelectionChangeKind, QuickPickItem } from 'vscode';
 import { join } from 'path';
 import { closeAllEditors, pathEquals, createRandomFile } from '../utils';

@ -145,22 +145,22 @@ suite('vscode API - window', () => {
 		});
 	});

-	test('active editor not always correct... #49125', async function () {
-		const randomFile1 = await createRandomFile();
-		const randomFile2 = await createRandomFile();
+	// test('active editor not always correct... #49125', async function () {
+	// 	const randomFile1 = await createRandomFile();
+	// 	const randomFile2 = await createRandomFile();

-		const [docA, docB] = await Promise.all([
-			workspace.openTextDocument(randomFile1),
-			workspace.openTextDocument(randomFile2)
-		]);
-		for (let c = 0; c < 4; c++) {
-			let editorA = await window.showTextDocument(docA, ViewColumn.One);
-			assert.equal(window.activeTextEditor, editorA);
+	// 	const [docA, docB] = await Promise.all([
+	// 		workspace.openTextDocument(randomFile1),
+	// 		workspace.openTextDocument(randomFile2)
+	// 	]);
+	// 	for (let c = 0; c < 4; c++) {
+	// 		let editorA = await window.showTextDocument(docA, ViewColumn.One);
+	// 		assert.equal(window.activeTextEditor, editorA);

-			let editorB = await window.showTextDocument(docB, ViewColumn.Two);
-			assert.equal(window.activeTextEditor, editorB);
-		}
-	});
+	// 		let editorB = await window.showTextDocument(docB, ViewColumn.Two);
+	// 		assert.equal(window.activeTextEditor, editorB);
+	// 	}
+	// });

 	test('default column when opening a file', async () => {
 		const [docA, docB, docC] = await Promise.all([
@ -383,33 +383,31 @@ suite('vscode API - window', () => {
 		assert.equal(await two, 'notempty');
 	});

-	// TODO@chrmarti Disabled due to flaky behaviour (https://github.com/Microsoft/vscode/issues/70887)
-	// test('showQuickPick, accept first', async function () {
-	// 	const pick = window.showQuickPick(['eins', 'zwei', 'drei']);
-	// 	await new Promise(resolve => setTimeout(resolve, 10)); // Allow UI to update.
-	// 	await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
-	// 	assert.equal(await pick, 'eins');
-	// });
-
-	test('showQuickPick, accept second', async function () {
-		const resolves: ((value: string) => void)[] = [];
-		let done: () => void;
-		const unexpected = new Promise((resolve, reject) => {
-			done = () => resolve();
-			resolves.push(reject);
-		});
-		const first = new Promise(resolve => resolves.push(resolve));
+	test('showQuickPick, accept first', async function () {
+		const tracker = createQuickPickTracker<string>();
+		const first = tracker.nextItem();
 		const pick = window.showQuickPick(['eins', 'zwei', 'drei'], {
-			onDidSelectItem: item => resolves.pop()!(item as string)
+			onDidSelectItem: tracker.onDidSelectItem
 		});
 		assert.equal(await first, 'eins');
-		const second = new Promise(resolve => resolves.push(resolve));
+		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+		assert.equal(await pick, 'eins');
+		return tracker.done();
+	});
+
+	test('showQuickPick, accept second', async function () {
+		const tracker = createQuickPickTracker<string>();
+		const first = tracker.nextItem();
+		const pick = window.showQuickPick(['eins', 'zwei', 'drei'], {
+			onDidSelectItem: tracker.onDidSelectItem
+		});
+		assert.equal(await first, 'eins');
+		const second = tracker.nextItem();
 		await commands.executeCommand('workbench.action.quickOpenSelectNext');
 		assert.equal(await second, 'zwei');
 		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
 		assert.equal(await pick, 'zwei');
-		done!();
-		return unexpected;
+		return tracker.done();
 	});

 	test('showQuickPick, select first two', async function () {
@ -438,19 +436,27 @@ suite('vscode API - window', () => {
 		return unexpected;
 	});

-	// TODO@chrmarti Disabled due to flaky behaviour (https://github.com/Microsoft/vscode/issues/70887)
-	// test('showQuickPick, keep selection (Microsoft/vscode-azure-account#67)', async function () {
-	// 	const picks = window.showQuickPick([
-	// 		{ label: 'eins' },
-	// 		{ label: 'zwei', picked: true },
-	// 		{ label: 'drei', picked: true }
-	// 	], {
-	// 			canPickMany: true
-	// 		});
-	// 	await new Promise(resolve => setTimeout(resolve, 10)); // Allow UI to update.
-	// 	await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
-	// 	assert.deepStrictEqual((await picks)!.map(pick => pick.label), ['zwei', 'drei']);
-	// });
+	test('showQuickPick, keep selection (Microsoft/vscode-azure-account#67)', async function () {
+		const picks = window.showQuickPick([
+			{ label: 'eins' },
+			{ label: 'zwei', picked: true },
+			{ label: 'drei', picked: true }
+		], {
+			canPickMany: true
+		});
+		await new Promise<void>(resolve => setTimeout(() => resolve(), 100));
+		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+		if (await Promise.race([picks, new Promise<boolean>(resolve => setTimeout(() => resolve(false), 100))]) === false) {
+			await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+			if (await Promise.race([picks, new Promise<boolean>(resolve => setTimeout(() => resolve(false), 1000))]) === false) {
+				await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+				if (await Promise.race([picks, new Promise<boolean>(resolve => setTimeout(() => resolve(false), 1000))]) === false) {
+					assert.ok(false, 'Picks not resolved!');
+				}
+			}
+		}
+		assert.deepStrictEqual((await picks)!.map(pick => pick.label), ['zwei', 'drei']);
+	});

 	test('showQuickPick, undefined on cancel', function () {
 		const source = new CancellationTokenSource();
@ -521,20 +527,24 @@ suite('vscode API - window', () => {
 		return Promise.all([a, b]);
 	});

-	// TODO@chrmarti Disabled due to flaky behaviour (https://github.com/Microsoft/vscode/issues/70887)
-	// test('showWorkspaceFolderPick', async function () {
-	// 	const p = window.showWorkspaceFolderPick(undefined);
+	test('showWorkspaceFolderPick', async function () {
+		const p = window.showWorkspaceFolderPick(undefined);

-	// 	await timeout(10);
-	// 	await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
-	// 	try {
-	// 		await p;
-	// 		assert.ok(true);
-	// 	}
-	// 	catch (_error) {
-	// 		assert.ok(false);
-	// 	}
-	// });
+		await new Promise(resolve => setTimeout(resolve, 10));
+		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+		const r1 = await Promise.race([p, new Promise<boolean>(resolve => setTimeout(() => resolve(false), 100))]);
+		if (r1 !== false) {
+			return;
+		}
+		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+		const r2 = await Promise.race([p, new Promise<boolean>(resolve => setTimeout(() => resolve(false), 1000))]);
+		if (r2 !== false) {
+			return;
+		}
+		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+		const r3 = await Promise.race([p, new Promise<boolean>(resolve => setTimeout(() => resolve(false), 1000))]);
+		assert.ok(r3 !== false);
+	});

 	test('Default value for showInput Box not accepted when it fails validateInput, reversing #33691', async function () {
 		const result = window.showInputBox({
@ -551,6 +561,23 @@ suite('vscode API - window', () => {
 		assert.equal(await result, undefined);
 	});

+	function createQuickPickTracker<T extends string | QuickPickItem>() {
+		const resolves: ((value: T) => void)[] = [];
+		let done: () => void;
+		const unexpected = new Promise((resolve, reject) => {
+			done = () => resolve();
+			resolves.push(reject);
+		});
+		return {
+			onDidSelectItem: (item: T) => resolves.pop()!(item),
+			nextItem: () => new Promise<T>(resolve => resolves.push(resolve)),
+			done: () => {
+				done!();
+				return unexpected;
+			},
+		};
+	}
+

 	test('editor, selection change kind', () => {
 		return workspace.openTextDocument(join(workspace.rootPath || '', './far.js')).then(doc => window.showTextDocument(doc)).then(editor => {
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts
@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/

 import * as assert from 'assert';
-import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomExecution, Pseudoterminal, TaskScope, commands, Task2, env, UIKind, ShellExecution } from 'vscode';
+import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomExecution, Pseudoterminal, TaskScope, commands, Task2, env, UIKind, ShellExecution, TaskExecution, Terminal, Event } from 'vscode';

 // Disable tasks tests:
 // - Web https://github.com/microsoft/vscode/issues/90528
@ -28,26 +28,55 @@ import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomEx
 			const taskType: string = 'customTesting';
 			const taskName = 'First custom task';
 			let isPseudoterminalClosed = false;
+			let terminal: Terminal | undefined;
+			// There's a strict order that should be observed here:
+			// 1. The terminal opens
+			// 2. The terminal is written to.
+			// 3. The terminal is closed.
+			enum TestOrder {
+				Start,
+				TerminalOpened,
+				TerminalWritten,
+				TerminalClosed
+			}
+
+			let testOrder = TestOrder.Start;
+
 			disposables.push(window.onDidOpenTerminal(term => {
-				disposables.push(window.onDidWriteTerminalData(e => {
-					try {
-						assert.equal(e.data, 'testing\r\n');
-					} catch (e) {
-						done(e);
-					}
-					disposables.push(window.onDidCloseTerminal(() => {
-						try {
-							// Pseudoterminal.close should have fired by now, additionally we want
-							// to make sure all events are flushed before continuing with more tests
-							assert.ok(isPseudoterminalClosed);
-						} catch (e) {
-							done(e);
-							return;
-						}
-						done();
-					}));
-					term.dispose();
-				}));
+				try {
+					assert.equal(testOrder, TestOrder.Start);
+				} catch (e) {
+					done(e);
+				}
+				testOrder = TestOrder.TerminalOpened;
+				terminal = term;
+			}));
+			disposables.push(window.onDidWriteTerminalData(e => {
+				try {
+					assert.equal(testOrder, TestOrder.TerminalOpened);
+					testOrder = TestOrder.TerminalWritten;
+					assert.notEqual(terminal, undefined);
+					assert.equal(e.data, 'testing\r\n');
+				} catch (e) {
+					done(e);
+				}
+
+				if (terminal) {
+					terminal.dispose();
+				}
+			}));
+			disposables.push(window.onDidCloseTerminal(() => {
+				try {
+					assert.equal(testOrder, TestOrder.TerminalWritten);
+					testOrder = TestOrder.TerminalClosed;
+					// Pseudoterminal.close should have fired by now, additionally we want
+					// to make sure all events are flushed before continuing with more tests
+					assert.ok(isPseudoterminalClosed);
+				} catch (e) {
+					done(e);
+					return;
+				}
+				done();
 			}));
 			disposables.push(tasks.registerTaskProvider(taskType, {
 				provideTasks: () => {
@ -138,35 +167,106 @@ import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomEx
 			commands.executeCommand('workbench.action.tasks.runTask', `${taskType}: ${taskName}`);
 		});

-		test('Execution from event is equal to original', () => {
+		test('Execution from onDidEndTaskProcess is equal to original', () => {
 			return new Promise(async (resolve, reject) => {
 				const task = new Task({ type: 'testTask' }, TaskScope.Workspace, 'echo', 'testTask', new ShellExecution('echo', ['hello test']));
-				const taskExecution = await tasks.executeTask(task);
-				let equalCount = 2;
-				function checkEqualCount() {
-					equalCount--;
-					if (equalCount === 0) {
-						resolve();
-					} else if (equalCount < 0) {
-						reject('Unexpected extra task events.');
-					}
-				}
+				let taskExecution: TaskExecution | undefined;

-				tasks.onDidStartTaskProcess(e => {
-					if (e.execution === taskExecution) {
-						checkEqualCount();
-					} else {
+				disposables.push(tasks.onDidStartTaskProcess(e => {
+					if (taskExecution === undefined) {
+						reject('taskExecution is still undefined when process started.');
+					} else if (e.execution !== taskExecution) {
 						reject('Unexpected task execution value in start process.');
 					}
-				});
+				}));

-				tasks.onDidEndTaskProcess(e => {
-					if (e.execution === taskExecution) {
-						checkEqualCount();
+				disposables.push(tasks.onDidEndTaskProcess(e => {
+					if (taskExecution === undefined) {
+						reject('taskExecution is still undefined when process ended.');
+					} else if (e.execution === taskExecution) {
+						resolve();
 					} else {
 						reject('Unexpected task execution value in end process.');
 					}
-				});
+				}));
+
+				taskExecution = await tasks.executeTask(task);
+			});
+		});
+
+		test('Execution from onDidStartTaskProcess is equal to original', () => {
+			return new Promise(async (resolve, reject) => {
+				const task = new Task({ type: 'testTask' }, TaskScope.Workspace, 'echo', 'testTask', new ShellExecution('echo', ['hello test']));
+				let taskExecution: TaskExecution | undefined;
+
+				disposables.push(tasks.onDidStartTaskProcess(e => {
+					if (taskExecution === undefined) {
+						reject('taskExecution is still undefined when process started.');
+					} else if (e.execution === taskExecution) {
+						resolve();
+					} else {
+						reject('Unexpected task execution value in start process.');
+					}
+				}));
+
+				disposables.push(tasks.onDidEndTaskProcess(e => {
+					if (taskExecution === undefined) {
+						reject('taskExecution is still undefined when process ended.');
+					} else if (e.execution !== taskExecution) {
+						reject('Unexpected task execution value in end process.');
+					}
+				}));
+
+				taskExecution = await tasks.executeTask(task);
+			});
+		});
+
+		// https://github.com/microsoft/vscode/issues/100577
+		test('A CustomExecution task can be fetched and executed', () => {
+			return new Promise(async (resolve, reject) => {
+				class CustomTerminal implements Pseudoterminal {
+					private readonly writeEmitter = new EventEmitter<string>();
+					public readonly onDidWrite: Event<string> = this.writeEmitter.event;
+					public async close(): Promise<void> { }
+					public open(): void {
+						this.close();
+						resolve();
+					}
+				}
+
+				function buildTask(): Task {
+					const task = new Task(
+						{
+							type: 'customTesting',
+						},
+						TaskScope.Workspace,
+						'Test Task',
+						'customTesting',
+						new CustomExecution(
+							async (): Promise<Pseudoterminal> => {
+								return new CustomTerminal();
+							}
+						)
+					);
+					return task;
+				}
+
+				disposables.push(tasks.registerTaskProvider('customTesting', {
+					provideTasks: () => {
+						return [buildTask()];
+					},
+					resolveTask(_task: Task): undefined {
+						return undefined;
+					}
+				}));
+
+				const task = await tasks.fetchTasks({ type: 'customTesting' });
+
+				if (task && task.length > 0) {
+					await tasks.executeTask(task[0]);
+				} else {
+					reject('fetched task can\'t be undefined');
+				}
 			});
 		});
 	});
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@ -60,12 +60,12 @@ suite('vscode API - workspace', () => {
 		}
 	});

-	test('openTextDocument', () => {
-		let len = vscode.workspace.textDocuments.length;
-		return vscode.workspace.openTextDocument(join(vscode.workspace.rootPath || '', './simple.txt')).then(doc => {
-			assert.ok(doc);
-			assert.equal(vscode.workspace.textDocuments.length, len + 1);
-		});
+	test('openTextDocument', async () => {
+		const len = vscode.workspace.textDocuments.length;
+		const uri = await createRandomFile();
+		const doc = await vscode.workspace.openTextDocument(uri);
+		assert.ok(doc);
+		assert.equal(vscode.workspace.textDocuments.length, len + 1);
 	});

 	test('openTextDocument, illegal path', () => {
--- a/extensions/vscode-notebook-tests/src/notebook.test.ts
+++ b/extensions/vscode-notebook-tests/src/notebook.test.ts
@ -568,49 +568,113 @@ suite('notebook undo redo', () => {
 		await vscode.commands.executeCommand('workbench.action.files.save');
 		await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
 	});
+
+	test.skip('execute and then undo redo', async function () {
+		const resource = vscode.Uri.file(join(vscode.workspace.rootPath || '', './first.vsctestnb'));
+		await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
+
+		const cellsChangeEvent = getEventOncePromise<vscode.NotebookCellsChangeEvent>(vscode.notebook.onDidChangeNotebookCells);
+		await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow');
+		const cellChangeEventRet = await cellsChangeEvent;
+		assert.equal(cellChangeEventRet.document, vscode.notebook.activeNotebookEditor?.document);
+		assert.equal(cellChangeEventRet.changes.length, 1);
+		assert.deepEqual(cellChangeEventRet.changes[0], {
+			start: 1,
+			deletedCount: 0,
+			deletedItems: [],
+			items: [
+				vscode.notebook.activeNotebookEditor!.document.cells[1]
+			]
+		});
+
+		const secondCell = vscode.notebook.activeNotebookEditor!.document.cells[1];
+
+		const moveCellEvent = getEventOncePromise<vscode.NotebookCellsChangeEvent>(vscode.notebook.onDidChangeNotebookCells);
+		await vscode.commands.executeCommand('notebook.cell.moveUp');
+		const moveCellEventRet = await moveCellEvent;
+		assert.deepEqual(moveCellEventRet, {
+			document: vscode.notebook.activeNotebookEditor!.document,
+			changes: [
+				{
+					start: 1,
+					deletedCount: 1,
+					deletedItems: [secondCell],
+					items: []
+				},
+				{
+					start: 0,
+					deletedCount: 0,
+					deletedItems: [],
+					items: [vscode.notebook.activeNotebookEditor?.document.cells[0]]
+				}
+			]
+		});
+
+		const cellOutputChange = getEventOncePromise<vscode.NotebookCellOutputsChangeEvent>(vscode.notebook.onDidChangeCellOutputs);
+		await vscode.commands.executeCommand('notebook.cell.execute');
+		const cellOutputsAddedRet = await cellOutputChange;
+		assert.deepEqual(cellOutputsAddedRet, {
+			document: vscode.notebook.activeNotebookEditor!.document,
+			cells: [vscode.notebook.activeNotebookEditor!.document.cells[0]]
+		});
+		assert.equal(cellOutputsAddedRet.cells[0].outputs.length, 1);
+
+		const cellOutputClear = getEventOncePromise<vscode.NotebookCellOutputsChangeEvent>(vscode.notebook.onDidChangeCellOutputs);
+		await vscode.commands.executeCommand('notebook.undo');
+		const cellOutputsCleardRet = await cellOutputClear;
+		assert.deepEqual(cellOutputsCleardRet, {
+			document: vscode.notebook.activeNotebookEditor!.document,
+			cells: [vscode.notebook.activeNotebookEditor!.document.cells[0]]
+		});
+		assert.equal(cellOutputsAddedRet.cells[0].outputs.length, 0);
+
+		await vscode.commands.executeCommand('workbench.action.files.save');
+		await vscode.commands.executeCommand('workbench.action.closeAllEditors');
+	});
+
 });

 suite('notebook working copy', () => {
-	test('notebook revert on close', async function () {
-		const resource = vscode.Uri.file(join(vscode.workspace.rootPath || '', './first.vsctestnb'));
-		await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
-		await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow');
-		assert.equal(vscode.notebook.activeNotebookEditor!.selection?.document.getText(), '');
+	// test('notebook revert on close', async function () {
+	// 	const resource = vscode.Uri.file(join(vscode.workspace.rootPath || '', './first.vsctestnb'));
+	// 	await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
+	// 	await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow');
+	// 	assert.equal(vscode.notebook.activeNotebookEditor!.selection?.document.getText(), '');

-		await vscode.commands.executeCommand('notebook.cell.insertCodeCellAbove');
-		await vscode.commands.executeCommand('default:type', { text: 'var abc = 0;' });
+	// 	await vscode.commands.executeCommand('notebook.cell.insertCodeCellAbove');
+	// 	await vscode.commands.executeCommand('default:type', { text: 'var abc = 0;' });

-		// close active editor from command will revert the file
-		await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
-		await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
-		assert.equal(vscode.notebook.activeNotebookEditor !== undefined, true);
-		assert.equal(vscode.notebook.activeNotebookEditor?.selection !== undefined, true);
-		assert.deepEqual(vscode.notebook.activeNotebookEditor?.document.cells[0], vscode.notebook.activeNotebookEditor?.selection);
-		assert.equal(vscode.notebook.activeNotebookEditor?.selection?.document.getText(), 'test');
+	// 	// close active editor from command will revert the file
+	// 	await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
+	// 	await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
+	// 	assert.equal(vscode.notebook.activeNotebookEditor !== undefined, true);
+	// 	assert.equal(vscode.notebook.activeNotebookEditor?.selection !== undefined, true);
+	// 	assert.deepEqual(vscode.notebook.activeNotebookEditor?.document.cells[0], vscode.notebook.activeNotebookEditor?.selection);
+	// 	assert.equal(vscode.notebook.activeNotebookEditor?.selection?.document.getText(), 'test');

-		await vscode.commands.executeCommand('workbench.action.files.save');
-		await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
-	});
+	// 	await vscode.commands.executeCommand('workbench.action.files.save');
+	// 	await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
+	// });

-	test('notebook revert', async function () {
-		const resource = vscode.Uri.file(join(vscode.workspace.rootPath || '', './first.vsctestnb'));
-		await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
-		await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow');
-		assert.equal(vscode.notebook.activeNotebookEditor!.selection?.document.getText(), '');
+	// test('notebook revert', async function () {
+	// 	const resource = vscode.Uri.file(join(vscode.workspace.rootPath || '', './first.vsctestnb'));
+	// 	await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
+	// 	await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow');
+	// 	assert.equal(vscode.notebook.activeNotebookEditor!.selection?.document.getText(), '');

-		await vscode.commands.executeCommand('notebook.cell.insertCodeCellAbove');
-		await vscode.commands.executeCommand('default:type', { text: 'var abc = 0;' });
-		await vscode.commands.executeCommand('workbench.action.files.revert');
+	// 	await vscode.commands.executeCommand('notebook.cell.insertCodeCellAbove');
+	// 	await vscode.commands.executeCommand('default:type', { text: 'var abc = 0;' });
+	// 	await vscode.commands.executeCommand('workbench.action.files.revert');

-		assert.equal(vscode.notebook.activeNotebookEditor !== undefined, true);
-		assert.equal(vscode.notebook.activeNotebookEditor?.selection !== undefined, true);
-		assert.deepEqual(vscode.notebook.activeNotebookEditor?.document.cells[0], vscode.notebook.activeNotebookEditor?.selection);
-		assert.deepEqual(vscode.notebook.activeNotebookEditor?.document.cells.length, 1);
-		assert.equal(vscode.notebook.activeNotebookEditor?.selection?.document.getText(), 'test');
+	// 	assert.equal(vscode.notebook.activeNotebookEditor !== undefined, true);
+	// 	assert.equal(vscode.notebook.activeNotebookEditor?.selection !== undefined, true);
+	// 	assert.deepEqual(vscode.notebook.activeNotebookEditor?.document.cells[0], vscode.notebook.activeNotebookEditor?.selection);
+	// 	assert.deepEqual(vscode.notebook.activeNotebookEditor?.document.cells.length, 1);
+	// 	assert.equal(vscode.notebook.activeNotebookEditor?.selection?.document.getText(), 'test');

-		await vscode.commands.executeCommand('workbench.action.files.saveAll');
-		await vscode.commands.executeCommand('workbench.action.closeAllEditors');
-	});
+	// 	await vscode.commands.executeCommand('workbench.action.files.saveAll');
+	// 	await vscode.commands.executeCommand('workbench.action.closeAllEditors');
+	// });

 	test('multiple tabs: dirty + clean', async function () {
 		const resource = vscode.Uri.file(join(vscode.workspace.rootPath || '', './first.vsctestnb'));
--- a/extensions/vscode-notebook-tests/src/notebookSmokeTestMain.ts
+++ b/extensions/vscode-notebook-tests/src/notebookSmokeTestMain.ts
@ -50,11 +50,20 @@ export function smokeTestActivate(context: vscode.ExtensionContext): any {

 			return dto;
 		},
+		resolveNotebook: async (_document: vscode.NotebookDocument) => {
+			return;
+		},
 		saveNotebook: async (_document: vscode.NotebookDocument, _cancellation: vscode.CancellationToken) => {
 			return;
 		},
 		saveNotebookAs: async (_targetResource: vscode.Uri, _document: vscode.NotebookDocument, _cancellation: vscode.CancellationToken) => {
 			return;
+		},
+		backupNotebook: async (_document: vscode.NotebookDocument, _context: vscode.NotebookDocumentBackupContext, _cancellation: vscode.CancellationToken) => {
+			return {
+				id: '1',
+				delete: () => { }
+			};
 		}
 	}));

--- a/extensions/vscode-notebook-tests/src/notebookTestMain.ts
+++ b/extensions/vscode-notebook-tests/src/notebookTestMain.ts
@ -10,8 +10,10 @@ import { smokeTestActivate } from './notebookSmokeTestMain';
 export function activate(context: vscode.ExtensionContext): any {
 	smokeTestActivate(context);

+	const _onDidChangeNotebook = new vscode.EventEmitter<vscode.NotebookDocumentEditEvent | vscode.NotebookDocumentContentChangeEvent>();
+	context.subscriptions.push(_onDidChangeNotebook);
 	context.subscriptions.push(vscode.notebook.registerNotebookContentProvider('notebookCoreTest', {
-		onDidChangeNotebook: new vscode.EventEmitter<vscode.NotebookDocumentEditEvent>().event,
+		onDidChangeNotebook: _onDidChangeNotebook.event,
 		openNotebook: async (_resource: vscode.Uri) => {
 			if (_resource.path.endsWith('empty.vsctestnb')) {
 				return {
@ -41,11 +43,20 @@ export function activate(context: vscode.ExtensionContext): any {

 			return dto;
 		},
+		resolveNotebook: async (_document: vscode.NotebookDocument) => {
+			return;
+		},
 		saveNotebook: async (_document: vscode.NotebookDocument, _cancellation: vscode.CancellationToken) => {
 			return;
 		},
 		saveNotebookAs: async (_targetResource: vscode.Uri, _document: vscode.NotebookDocument, _cancellation: vscode.CancellationToken) => {
 			return;
+		},
+		backupNotebook: async (_document: vscode.NotebookDocument, _context: vscode.NotebookDocumentBackupContext, _cancellation: vscode.CancellationToken) => {
+			return {
+				id: '1',
+				delete: () => { }
+			};
 		}
 	}));

@ -62,13 +73,13 @@ export function activate(context: vscode.ExtensionContext): any {
 			}];
 			return;
 		},
-		executeCell: async (_document: vscode.NotebookDocument, _cell: vscode.NotebookCell | undefined, _token: vscode.CancellationToken) => {
-			if (!_cell) {
-				_cell = _document.cells[0];
+		executeCell: async (document: vscode.NotebookDocument, cell: vscode.NotebookCell | undefined, _token: vscode.CancellationToken) => {
+			if (!cell) {
+				cell = document.cells[0];
 			}

-			if (_document.uri.path.endsWith('customRenderer.vsctestnb')) {
-				_cell.outputs = [{
+			if (document.uri.path.endsWith('customRenderer.vsctestnb')) {
+				cell.outputs = [{
 					outputKind: vscode.CellOutputKind.Rich,
 					data: {
 						'text/custom': 'test'
@ -78,26 +89,41 @@ export function activate(context: vscode.ExtensionContext): any {
 				return;
 			}

-			_cell.outputs = [{
+			const previousOutputs = cell.outputs;
+			const newOutputs: vscode.CellOutput[] = [{
 				outputKind: vscode.CellOutputKind.Rich,
 				data: {
 					'text/plain': ['my output']
 				}
 			}];

+			cell.outputs = newOutputs;
+
+			_onDidChangeNotebook.fire({
+				document: document,
+				undo: () => {
+					if (cell) {
+						cell.outputs = previousOutputs;
+					}
+				},
+				redo: () => {
+					if (cell) {
+						cell.outputs = newOutputs;
+					}
+				}
+			});
 			return;
 		}
 	}));

 	const preloadUri = vscode.Uri.file(path.resolve(__dirname, '../src/customRenderer.js'));
 	context.subscriptions.push(vscode.notebook.registerNotebookOutputRenderer('notebookCoreTestRenderer', {
-		type: 'display_data',
-		subTypes: [
+		mimeTypes: [
 			'text/custom'
 		]
 	}, {
 		preloads: [preloadUri],
-		render(_document: vscode.NotebookDocument, _output: vscode.CellDisplayOutput, _mimeType: string): string {
+		render(_document: vscode.NotebookDocument, _request: vscode.NotebookRenderRequest): string {
 			return '<div>test</div>';
 		}
 	}));
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@ -76,10 +76,10 @@ rimraf@^3.0.2:
  dependencies:
    glob "^7.1.3"

-typescript@3.9.4:
-  version "3.9.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.4.tgz#5aa0a54904b51b96dfd67870ce2db70251802f10"
-  integrity sha512-9OL+r0KVHqsYVH7K18IBR9hhC82YwLNlpSZfQDupGcfg8goB9p/s/9Okcy+ztnTeHR2U68xq21/igW9xpoGTgA==
+typescript@3.9.5:
+  version "3.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
+  integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==

 wrappy@1:
  version "1.0.2"
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "code-oss-dev",
  "version": "1.47.0",
-  "distro": "4eca5644666fe6fde9d765e71d0ca870f3c076a6",
+  "distro": "8a080e334f53a545be13ab3a468f509aefda7c86",
  "author": {
    "name": "Microsoft Corporation"
  },
@ -41,7 +41,7 @@
    "graceful-fs": "4.2.3",
    "http-proxy-agent": "^2.1.0",
    "https-proxy-agent": "^2.2.3",
-    "iconv-lite": "0.5.0",
+    "iconv-lite-umd": "0.6.3",
    "jschardet": "2.1.1",
    "keytar": "^5.5.0",
    "minimist": "^1.2.5",
@ -49,7 +49,7 @@
    "native-keymap": "2.1.2",
    "native-watchdog": "1.3.0",
    "node-pty": "0.10.0-beta8",
-    "semver-umd": "^5.5.6",
+    "semver-umd": "^5.5.7",
    "spdlog": "^0.11.1",
    "sudo-prompt": "9.1.1",
    "v8-inspect-profiler": "^0.0.20",
@ -74,7 +74,6 @@
    "@types/debug": "^4.1.5",
    "@types/graceful-fs": "4.1.2",
    "@types/http-proxy-agent": "^2.0.1",
-    "@types/iconv-lite": "0.0.1",
    "@types/keytar": "^4.4.0",
    "@types/minimist": "^1.2.0",
    "@types/mocha": "2.2.39",
@ -89,17 +88,16 @@
    "@types/yauzl": "^2.9.1",
    "@types/yazl": "^2.4.2",
    "@typescript-eslint/eslint-plugin": "3.2.0",
-    "@typescript-eslint/parser": "^3.2.1-alpha.2",
+    "@typescript-eslint/parser": "^3.3.0",
    "ansi-colors": "^3.2.3",
    "asar": "^0.14.0",
    "chromium-pickle-js": "^0.2.0",
    "copy-webpack-plugin": "^4.5.2",
-    "coveralls": "^2.11.11",
    "cson-parser": "^1.3.3",
    "css-loader": "^3.2.0",
    "debounce": "^1.0.0",
    "deemon": "^1.4.0",
-    "electron": "7.3.1",
+    "electron": "8.3.3",
    "eslint": "6.8.0",
    "eslint-plugin-jsdoc": "^19.1.0",
    "event-stream": "3.3.4",
@ -154,7 +152,7 @@
    "source-map": "^0.4.4",
    "style-loader": "^1.0.0",
    "ts-loader": "^4.4.2",
-    "typescript": "^4.0.0-dev.20200612",
+    "typescript": "^4.0.0-dev.20200622",
    "typescript-formatter": "7.1.0",
    "underscore": "^1.8.2",
    "vinyl": "^2.0.0",
--- a/product.json
+++ b/product.json
@ -60,7 +60,7 @@
 		},
 		{
 			"name": "ms-vscode.references-view",
-			"version": "0.0.57",
+			"version": "0.0.59",
 			"repo": "https://github.com/Microsoft/vscode-reference-view",
 			"metadata": {
 				"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",
--- a/remote/package.json
+++ b/remote/package.json
@ -8,12 +8,12 @@
    "graceful-fs": "4.2.3",
    "http-proxy-agent": "^2.1.0",
    "https-proxy-agent": "^2.2.3",
-    "iconv-lite": "0.5.0",
+    "iconv-lite-umd": "0.6.3",
    "jschardet": "2.1.1",
    "minimist": "^1.2.5",
    "native-watchdog": "1.3.0",
    "node-pty": "0.10.0-beta8",
-    "semver-umd": "^5.5.6",
+    "semver-umd": "^5.5.7",
    "spdlog": "^0.11.1",
    "vscode-nsfw": "1.2.8",
    "vscode-oniguruma": "1.3.1",
--- a/remote/web/package.json
+++ b/remote/web/package.json
@ -2,7 +2,9 @@
 	"name": "vscode-web",
 	"version": "0.0.0",
 	"dependencies": {
-		"semver-umd": "^5.5.6",
+		"semver-umd": "^5.5.7",
+		"iconv-lite-umd": "0.6.3",
+		"jschardet": "2.1.1",
 		"vscode-oniguruma": "1.3.1",
 		"vscode-textmate": "5.1.1",
 		"xterm": "4.7.0-beta.3",
--- a/remote/web/yarn.lock
+++ b/remote/web/yarn.lock
@ -2,10 +2,20 @@
 # yarn lockfile v1


-semver-umd@^5.5.6:
-  version "5.5.6"
-  resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.6.tgz#1d185bbd2caec825c564b54907cd09e14083f228"
-  integrity sha512-6ARYXVi4Y4VO5HfyCjT/6xyykBtJwEXSGQ8ON4UPQSFOjZUDsbAE0J614QcBBsLTTyQMEqvsXN804vAqpydjzw==
+iconv-lite-umd@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.3.tgz#61307cab8ac29939992d0724d3ab8799467f0e97"
+  integrity sha512-fQ/8XE8reiCZ6t+SX4tX6/tQdV4tThJZv5qtMe5Sk+IWsExz0S2Zd+GiBS5IEPgDxnsmiJSpH67+qzN3FT4lKw==
+
+jschardet@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.1.1.tgz#af6f8fd0b3b0f5d46a8fd9614a4fce490575c184"
+  integrity sha512-pA5qG9Zwm8CBpGlK/lo2GE9jPxwqRgMV7Lzc/1iaPccw6v4Rhj8Zg2BTyrdmHmxlJojnbLupLeRnaPLsq03x6Q==
+
+semver-umd@^5.5.7:
+  version "5.5.7"
+  resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.7.tgz#966beb5e96c7da6fbf09c3da14c2872d6836c528"
+  integrity sha512-XgjPNlD0J6aIc8xoTN6GQGwWc2Xg0kq8NzrqMVuKG/4Arl6ab1F8+Am5Y/XKKCR+FceFr2yN/Uv5ZJBhRyRqKg==

 vscode-oniguruma@1.3.1:
  version "1.3.1"
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@ -176,12 +176,10 @@ https-proxy-agent@^2.2.3:
    agent-base "^4.3.0"
    debug "^3.1.0"

-iconv-lite@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.0.tgz#59cdde0a2a297cc2aeb0c6445a195ee89f127550"
-  integrity sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+iconv-lite-umd@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.3.tgz#61307cab8ac29939992d0724d3ab8799467f0e97"
+  integrity sha512-fQ/8XE8reiCZ6t+SX4tX6/tQdV4tThJZv5qtMe5Sk+IWsExz0S2Zd+GiBS5IEPgDxnsmiJSpH67+qzN3FT4lKw==

 ip@^1.1.5:
  version "1.1.5"
@ -300,15 +298,10 @@ readdirp@~3.2.0:
  dependencies:
    picomatch "^2.0.4"

-"safer-buffer@>= 2.1.2 < 3":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-semver-umd@^5.5.6:
-  version "5.5.6"
-  resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.6.tgz#1d185bbd2caec825c564b54907cd09e14083f228"
-  integrity sha512-6ARYXVi4Y4VO5HfyCjT/6xyykBtJwEXSGQ8ON4UPQSFOjZUDsbAE0J614QcBBsLTTyQMEqvsXN804vAqpydjzw==
+semver-umd@^5.5.7:
+  version "5.5.7"
+  resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.7.tgz#966beb5e96c7da6fbf09c3da14c2872d6836c528"
+  integrity sha512-XgjPNlD0J6aIc8xoTN6GQGwWc2Xg0kq8NzrqMVuKG/4Arl6ab1F8+Am5Y/XKKCR+FceFr2yN/Uv5ZJBhRyRqKg==

 semver@^5.3.0:
  version "5.6.0"
--- a/resources/linux/snap/snapcraft.yaml
+++ b/resources/linux/snap/snapcraft.yaml
@ -24,6 +24,7 @@ parts:
    plugin: dump
    source: .
    stage-packages:
+      - ibus-gtk3
      - fcitx-frontend-gtk3
      - gvfs-libs
      - libasound2
--- a/resources/serverless/code-web.js
+++ b/resources/serverless/code-web.js
@ -6,7 +6,6 @@
 *--------------------------------------------------------------------------------------------*/

 // @ts-check
-/** @typedef {import('../../src/vs/workbench/workbench.web.api').IWorkbenchConstructionOptions} WebConfiguration **/

 const http = require('http');
 const url = require('url');
@ -63,14 +62,29 @@ const readFile = (path) => util.promisify(fs.readFile)(path);
 const CharCode_PC = '%'.charCodeAt(0);

 async function initialize() {
-	const extensionFolders = await util.promisify(fs.readdir)(EXTENSIONS_ROOT);
-
-	const staticExtensions = [];
-
+	const builtinExtensions = [];
 	const webpackConfigs = [];

-	await Promise.all(extensionFolders.map(async extensionFolder => {
-		const packageJSONPath = path.join(EXTENSIONS_ROOT, extensionFolder, 'package.json');
+	const children = await util.promisify(fs.readdir)(EXTENSIONS_ROOT, { withFileTypes: true });
+	const folders = children.filter(c => !c.isFile());
+	await Promise.all(folders.map(async folder => {
+		const folderName = folder.name;
+		const extensionPath = path.join(EXTENSIONS_ROOT, folderName);
+
+		let children = [];
+		try {
+			children = await util.promisify(fs.readdir)(extensionPath);
+		} catch (error) {
+			console.log(error);
+			return;
+		}
+
+		const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0];
+		const readmePath = readme ? path.join(extensionPath, readme) : undefined;
+		const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0];
+		const changelogPath = changelog ? path.join(extensionPath, changelog) : undefined;
+
+		const packageJSONPath = path.join(EXTENSIONS_ROOT, folderName, 'package.json');
 		if (await exists(packageJSONPath)) {
 			try {
 				const packageJSON = JSON.parse((await readFile(packageJSONPath)).toString());
@ -82,7 +96,7 @@ async function initialize() {
 					packageJSON.main = packageJSON.browser;

 					const webpackConfigLocations = await util.promisify(glob)(
-						path.join(EXTENSIONS_ROOT, extensionFolder, '**', 'extension-browser.webpack.config.js'),
+						path.join(EXTENSIONS_ROOT, folderName, '**', 'extension-browser.webpack.config.js'),
 						{ ignore: ['**/node_modules'] }
 					);

@ -99,31 +113,16 @@ async function initialize() {
 					}
 				}

-				const packageNlsPath = path.join(EXTENSIONS_ROOT, extensionFolder, 'package.nls.json');
-				if (await exists(packageNlsPath)) {
-					const packageNls = JSON.parse((await readFile(packageNlsPath)).toString());
-					const translate = (obj) => {
-						for (let key in obj) {
-							const val = obj[key];
-							if (Array.isArray(val)) {
-								val.forEach(translate);
-							} else if (val && typeof val === 'object') {
-								translate(val);
-							} else if (typeof val === 'string' && val.charCodeAt(0) === CharCode_PC && val.charCodeAt(val.length - 1) === CharCode_PC) {
-								const translated = packageNls[val.substr(1, val.length - 2)];
-								if (translated) {
-									obj[key] = translated;
-								}
-							}
-						}
-					};
-					translate(packageJSON);
-				}
 				packageJSON.extensionKind = ['web']; // enable for Web
-				staticExtensions.push({
+
+				const packageNLSPath = path.join(folderName, 'package.nls.json');
+				const packageNLSExists = await exists(path.join(EXTENSIONS_ROOT, packageNLSPath));
+				builtinExtensions.push({
+					extensionPath: folderName,
 					packageJSON,
-					extensionLocation: { scheme: SCHEME, authority: AUTHORITY, path: `/static-extension/${extensionFolder}` },
-					isBuiltin: true
+					packageNLSPath: packageNLSExists ? packageNLSPath : undefined,
+					readmePath,
+					changelogPath
 				});
 			} catch (e) {
 				console.log(e);
@ -139,7 +138,7 @@ async function initialize() {
 					reject();
 				} else {
 					console.log(stats.toString());
-					resolve(staticExtensions);
+					resolve(builtinExtensions);
 				}
 			});
 		} else {
@ -149,14 +148,14 @@ async function initialize() {
 					reject();
 				} else {
 					console.log(stats.toString());
-					resolve(staticExtensions);
+					resolve(builtinExtensions);
 				}
 			});
 		}
 	});
 }

-const staticExtensionsPromise = initialize();
+const builtinExtensionsPromise = initialize();

 const mapCallbackUriToRequestId = new Map();

@ -262,21 +261,18 @@ async function handleRoot(req, res) {
 		}
 	}

-	const staticExtensions = await staticExtensionsPromise;
-	/** @type {WebConfiguration} */
-	const webConfig = {
-		staticExtensions: staticExtensions,
-	};
+	const builtinExtensions = await builtinExtensionsPromise;

 	const webConfigJSON = escapeAttribute(JSON.stringify({
-		...webConfig,
 		folderUri: ghPath
 			? { scheme: 'github', authority: 'HEAD', path: ghPath }
 			: { scheme: 'memfs', path: `/sample-folder` },
+		builtinExtensionsServiceUrl: `${SCHEME}://${AUTHORITY}/static-extension`
 	}));

 	const data = (await util.promisify(fs.readFile)(WEB_MAIN)).toString()
 		.replace('{{WORKBENCH_WEB_CONFIGURATION}}', () => webConfigJSON) // use a replace function to avoid that regexp replace patterns ($&, $0, ...) are applied
+		.replace('{{WORKBENCH_BUILTIN_EXTENSIONS}}', () => escapeAttribute(JSON.stringify(builtinExtensions)))
 		.replace('{{WEBVIEW_ENDPOINT}}', '')
 		.replace('{{REMOTE_USER_DATA_URI}}', '');

--- a/resources/win32/bin/code.sh
+++ b/resources/win32/bin/code.sh
@ -13,48 +13,46 @@ NAME="@@NAME@@"
 DATAFOLDER="@@DATAFOLDER@@"
 VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
 ELECTRON="$VSCODE_PATH/$NAME.exe"
-if grep -qi Microsoft /proc/version; then
-	# in a wsl shell
-	WSL_BUILD=$(uname -r | sed -E 's/^[0-9.]+-([0-9]+)-Microsoft.*|([0-9]+).([0-9]+).([0-9]+)-microsoft-standard.*|.*/\1\2\3\4/')
-	if [ -z "$WSL_BUILD" ]; then
-		WSL_BUILD=0
-	fi

-	if [ $WSL_BUILD -ge 17063 ]; then
-		# $WSL_DISTRO_NAME is available since WSL builds 18362, also for WSL2
-		# WSLPATH is available since WSL build 17046
-		# WSLENV is available since WSL build 17063
-		export WSLENV=ELECTRON_RUN_AS_NODE/w:$WSLENV
-		CLI=$(wslpath -m "$VSCODE_PATH/resources/app/out/cli.js")
-
-		# use the Remote WSL extension if installed
-		WSL_EXT_ID="ms-vscode-remote.remote-wsl"
-
-		if [ $WSL_BUILD -ge 41955 -a $WSL_BUILD -lt 41959 ]; then
-			# WSL2 workaround for https://github.com/microsoft/WSL/issues/4337
-			CWD="$(pwd)"
-			cd "$VSCODE_PATH"
-			cmd.exe /C ".\\bin\\$APP_NAME.cmd --locate-extension $WSL_EXT_ID >%TEMP%\\remote-wsl-loc.txt"
-			WSL_EXT_WLOC=$(cmd.exe /C type %TEMP%\\remote-wsl-loc.txt)
-			cd "$CWD"
+IN_WSL=false
+if [ -n "$WSL_DISTRO_NAME" ]; then
+	# $WSL_DISTRO_NAME is available since WSL builds 18362, also for WSL2
+	IN_WSL=true
+else
+	WSL_BUILD=$(uname -r | sed -E 's/^[0-9.]+-([0-9]+)-Microsoft.*|.*/\1/')
+	if [ -n "$WSL_BUILD" ]; then
+		if [ "$WSL_BUILD" -ge 17063 ]; then
+			# WSLPATH is available since WSL build 17046
+			# WSLENV is available since WSL build 17063
+			IN_WSL=true
 		else
-			ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --locate-extension $WSL_EXT_ID >/tmp/remote-wsl-loc.txt 2>/dev/null
-			WSL_EXT_WLOC=$(cat /tmp/remote-wsl-loc.txt)
-		fi
-		if [ -n "$WSL_EXT_WLOC" ]; then
-			# replace \r\n with \n in WSL_EXT_WLOC
-			WSL_CODE=$(wslpath -u "${WSL_EXT_WLOC%%[[:cntrl:]]}")/scripts/wslCode.sh
-			"$WSL_CODE" "$COMMIT" "$QUALITY" "$ELECTRON" "$APP_NAME" "$DATAFOLDER" "$@"
+			# If running under older WSL, don't pass cli.js to Electron as
+			# environment vars cannot be transferred from WSL to Windows
+			# See: https://github.com/Microsoft/BashOnWindows/issues/1363
+			#      https://github.com/Microsoft/BashOnWindows/issues/1494
+			"$ELECTRON" "$@"
 			exit $?
 		fi
-	else
-		# If running under older WSL, don't pass cli.js to Electron as
-		# environment vars cannot be transferred from WSL to Windows
-		# See: https://github.com/Microsoft/BashOnWindows/issues/1363
-		#      https://github.com/Microsoft/BashOnWindows/issues/1494
-		"$ELECTRON" "$@"
+	fi
+fi
+if [ $IN_WSL = true ]; then
+
+	export WSLENV=ELECTRON_RUN_AS_NODE/w:$WSLENV
+	CLI=$(wslpath -m "$VSCODE_PATH/resources/app/out/cli.js")
+
+	# use the Remote WSL extension if installed
+	WSL_EXT_ID="ms-vscode-remote.remote-wsl"
+
+	ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --locate-extension $WSL_EXT_ID >/tmp/remote-wsl-loc.txt 2>/dev/null
+	WSL_EXT_WLOC=$(cat /tmp/remote-wsl-loc.txt)
+
+	if [ -n "$WSL_EXT_WLOC" ]; then
+		# replace \r\n with \n in WSL_EXT_WLOC
+		WSL_CODE=$(wslpath -u "${WSL_EXT_WLOC%%[[:cntrl:]]}")/scripts/wslCode.sh
+		"$WSL_CODE" "$COMMIT" "$QUALITY" "$ELECTRON" "$APP_NAME" "$DATAFOLDER" "$@"
 		exit $?
 	fi
+
 elif [ -x "$(command -v cygpath)" ]; then
 	CLI=$(cygpath -m "$VSCODE_PATH/resources/app/out/cli.js")
 else
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@ -43,8 +43,8 @@ if %errorlevel% neq 0 exit /b %errorlevel%

 :: Tests in the extension host

-call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-notebook-tests\test --enable-proposed-api=vscode.vscode-notebook-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-notebook-tests --extensionTestsPath=%~dp0\..\extensions\vscode-notebook-tests\out --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
-if %errorlevel% neq 0 exit /b %errorlevel%
+:: call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-notebook-tests\test --enable-proposed-api=vscode.vscode-notebook-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-notebook-tests --extensionTestsPath=%~dp0\..\extensions\vscode-notebook-tests\out --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
+:: if %errorlevel% neq 0 exit /b %errorlevel%

 call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-api-tests\testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out\singlefolder-tests --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
 if %errorlevel% neq 0 exit /b %errorlevel%
--- a/src/main.js
+++ b/src/main.js
@ -86,11 +86,10 @@ setCurrentWorkingDirectory();
 // Register custom schemes with privileges
 protocol.registerSchemesAsPrivileged([
 	{
-		scheme: 'vscode-resource',
+		scheme: 'vscode-webview',
 		privileges: {
+			standard: true,
 			secure: true,
-			supportFetchAPI: true,
-			corsEnabled: true,
 		}
 	}, {
 		scheme: 'vscode-webview-resource',
--- a/src/vs/base/browser/markdownRenderer.ts
+++ b/src/vs/base/browser/markdownRenderer.ts
@ -88,9 +88,13 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 		if (href) {
 			({ href, dimensions } = parseHrefAndDimensions(href));
 			href = _href(href, true);
-			if (options.baseUrl) {
-				href = resolvePath(options.baseUrl, href).toString();
-			}
+			try {
+				const hrefAsUri = URI.parse(href);
+				if (options.baseUrl && hrefAsUri.scheme === Schemas.file) { // absolute or relative local path, or file: uri
+					href = resolvePath(options.baseUrl, href).toString();
+				}
+			} catch (err) { }
+
 			attributes.push(`src="${href}"`);
 		}
 		if (text) {
--- a/src/vs/base/browser/ui/aria/aria.ts
+++ b/src/vs/base/browser/ui/aria/aria.ts
@ -11,50 +11,78 @@ import * as dom from 'vs/base/browser/dom';
 const MAX_MESSAGE_LENGTH = 20000;
 let ariaContainer: HTMLElement;
 let alertContainer: HTMLElement;
+let alertContainer2: HTMLElement;
 let statusContainer: HTMLElement;
+let statusContainer2: HTMLElement;
 export function setARIAContainer(parent: HTMLElement) {
 	ariaContainer = document.createElement('div');
 	ariaContainer.className = 'monaco-aria-container';

-	alertContainer = document.createElement('div');
-	alertContainer.className = 'monaco-alert';
-	alertContainer.setAttribute('role', 'alert');
-	alertContainer.setAttribute('aria-atomic', 'true');
-	ariaContainer.appendChild(alertContainer);
+	const createAlertContainer = () => {
+		const element = document.createElement('div');
+		element.className = 'monaco-alert';
+		element.setAttribute('role', 'alert');
+		element.setAttribute('aria-atomic', 'true');
+		ariaContainer.appendChild(element);
+		return element;
+	};
+	alertContainer = createAlertContainer();
+	alertContainer2 = createAlertContainer();

-	statusContainer = document.createElement('div');
-	statusContainer.className = 'monaco-status';
-	statusContainer.setAttribute('role', 'complementary');
-	statusContainer.setAttribute('aria-live', 'polite');
-	statusContainer.setAttribute('aria-atomic', 'true');
-	ariaContainer.appendChild(statusContainer);
+	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);
+		return element;
+	};
+	statusContainer = createStatusContainer();
+	statusContainer2 = createStatusContainer();

 	parent.appendChild(ariaContainer);
 }
-
 /**
 * Given the provided message, will make sure that it is read as alert to screen readers.
 */
 export function alert(msg: string): void {
-	insertMessage(alertContainer, msg);
+	if (!ariaContainer) {
+		return;
+	}
+
+	// Use alternate containers such that duplicated messages get read out by screen readers #99466
+	if (alertContainer.textContent !== msg) {
+		dom.clearNode(alertContainer2);
+		insertMessage(alertContainer, msg);
+	} else {
+		dom.clearNode(alertContainer);
+		insertMessage(alertContainer2, msg);
+	}
 }

 /**
 * Given the provided message, will make sure that it is read as status to screen readers.
 */
 export function status(msg: string): void {
-	if (isMacintosh) {
-		alert(msg); // VoiceOver does not seem to support status role
-	} else {
-		insertMessage(statusContainer, msg);
-	}
-}
-
-function insertMessage(target: HTMLElement, msg: string): void {
 	if (!ariaContainer) {
 		return;
 	}

+	if (isMacintosh) {
+		alert(msg); // VoiceOver does not seem to support status role
+	} else {
+		if (statusContainer.textContent !== msg) {
+			dom.clearNode(statusContainer2);
+			insertMessage(statusContainer, msg);
+		} else {
+			dom.clearNode(statusContainer);
+			insertMessage(statusContainer2, msg);
+		}
+	}
+}
+
+function insertMessage(target: HTMLElement, msg: string): void {
 	dom.clearNode(target);
 	if (msg.length > MAX_MESSAGE_LENGTH) {
 		msg = msg.substr(0, MAX_MESSAGE_LENGTH);
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@ -18,12 +18,16 @@ import { escape } from 'vs/base/common/strings';
 export interface IButtonOptions extends IButtonStyles {
 	readonly title?: boolean | string;
 	readonly supportCodicons?: boolean;
+	readonly secondary?: boolean;
 }

 export interface IButtonStyles {
 	buttonBackground?: Color;
 	buttonHoverBackground?: Color;
 	buttonForeground?: Color;
+	buttonSecondaryBackground?: Color;
+	buttonSecondaryHoverBackground?: Color;
+	buttonSecondaryForeground?: Color;
 	buttonBorder?: Color;
 }

@ -41,6 +45,9 @@ export class Button extends Disposable {
 	private buttonBackground: Color | undefined;
 	private buttonHoverBackground: Color | undefined;
 	private buttonForeground: Color | undefined;
+	private buttonSecondaryBackground: Color | undefined;
+	private buttonSecondaryHoverBackground: Color | undefined;
+	private buttonSecondaryForeground: Color | undefined;
 	private buttonBorder: Color | undefined;

 	private _onDidClick = this._register(new Emitter<Event>());
@ -54,9 +61,14 @@ export class Button extends Disposable {
 		this.options = options || Object.create(null);
 		mixin(this.options, defaultOptions, false);

+		this.buttonForeground = this.options.buttonForeground;
 		this.buttonBackground = this.options.buttonBackground;
 		this.buttonHoverBackground = this.options.buttonHoverBackground;
-		this.buttonForeground = this.options.buttonForeground;
+
+		this.buttonSecondaryForeground = this.options.buttonSecondaryForeground;
+		this.buttonSecondaryBackground = this.options.buttonSecondaryBackground;
+		this.buttonSecondaryHoverBackground = this.options.buttonSecondaryHoverBackground;
+
 		this.buttonBorder = this.options.buttonBorder;

 		this._element = document.createElement('a');
@ -114,7 +126,12 @@ export class Button extends Disposable {
 	}

 	private setHoverBackground(): void {
-		const hoverBackground = this.buttonHoverBackground ? this.buttonHoverBackground.toString() : null;
+		let hoverBackground;
+		if (this.options.secondary) {
+			hoverBackground = this.buttonSecondaryHoverBackground ? this.buttonSecondaryHoverBackground.toString() : null;
+		} else {
+			hoverBackground = this.buttonHoverBackground ? this.buttonHoverBackground.toString() : null;
+		}
 		if (hoverBackground) {
 			this._element.style.backgroundColor = hoverBackground;
 		}
@ -124,6 +141,9 @@ export class Button extends Disposable {
 		this.buttonForeground = styles.buttonForeground;
 		this.buttonBackground = styles.buttonBackground;
 		this.buttonHoverBackground = styles.buttonHoverBackground;
+		this.buttonSecondaryForeground = styles.buttonSecondaryForeground;
+		this.buttonSecondaryBackground = styles.buttonSecondaryBackground;
+		this.buttonSecondaryHoverBackground = styles.buttonSecondaryHoverBackground;
 		this.buttonBorder = styles.buttonBorder;

 		this.applyStyles();
@ -131,8 +151,15 @@ export class Button extends Disposable {

 	private applyStyles(): void {
 		if (this._element) {
-			const background = this.buttonBackground ? this.buttonBackground.toString() : '';
-			const foreground = this.buttonForeground ? this.buttonForeground.toString() : '';
+			let background, foreground;
+			if (this.options.secondary) {
+				foreground = this.buttonSecondaryForeground ? this.buttonSecondaryForeground.toString() : '';
+				background = this.buttonSecondaryBackground ? this.buttonSecondaryBackground.toString() : '';
+			} else {
+				foreground = this.buttonForeground ? this.buttonForeground.toString() : '';
+				background = this.buttonBackground ? this.buttonBackground.toString() : '';
+			}
+
 			const border = this.buttonBorder ? this.buttonBorder.toString() : '';

 			this._element.style.color = foreground;
--- a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
+++ b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
--- a/Show more
+++ b/Show more