coder · oxy · Jul 13, 2021 · Jun 4, 2021 · Jun 4, 2021 · Jun 8, 2021
@@ -1,97 +1,98 @@
 # Code - OSS Development Container
 
-This repository includes configuration for a development container for working with Code - OSS in an isolated local container or using [GitHub Codespaces](https://github.com/features/codespaces).
+This repository includes configuration for a development container for working with Code - OSS in a local container or using [GitHub Codespaces](https://github.com/features/codespaces).
 
-> **Tip:** The default VNC password is `vscode`. The VNC server runs on port `5901` with a web client at `6080`. For better performance, we recommend using a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Applications like the macOS Screen Sharing app will not perform as well.
+> **Tip:** The default VNC password is `vscode`. The VNC server runs on port `5901` and a web client is available on port `6080`.
 
 ## Quick start - local
 
 1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
 
-2. **Important**: Docker needs at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run full build. If you on macOS, or using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item, going to **Preferences/Settings > Resources > Advanced**.
+2. **Important**: Docker needs at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run a full build. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**.
 
     > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar.
 
 3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Remote - Containers](https://aka.ms/vscode-remote/download/containers) extension.
 
     ![Image of Remote - Containers extension](https://microsoft.github.io/vscode-remote-release/images/remote-containers-extn.png)
 
-    > Note that the Remote - Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details.
+    > **Note:** The Remote - Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details.
 
-4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and select **Remote-Containers: Clone Repository in Container Volume...**.
+4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Remote-Containers: Clone Repository in Container Volume...**.
 
-    > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or using the Hyper-V engine on Windows. We recommend the "clone repository in container" approach instead since it uses "named volume" rather than the local filesystem.
+    > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend the "clone repository in container" approach instead since it uses "named volume" rather than the local filesystem.
 
 5. Type `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box and press <kbd>Enter</kbd>.
 
-6. After the container is running, open a web browser and go to [http://localhost:6080](http://localhost:6080) or use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
+6. After the container is running, open a web browser and go to [http://localhost:6080](http://localhost:6080), or use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
 
-Anything you start in VS Code or the integrated terminal will appear here.
+Anything you start in VS Code, or the integrated terminal, will appear here.
 
 Next: **[Try it out!](#try-it)**
 
 ## Quick start - GitHub Codespaces
 
-> **IMPORTANT:** You need to use a "Standard" sized codespace or larger (4-core, 8GB) since VS Code needs 6GB of RAM to compile. This is now the default for GitHub Codespaces, but do not downgrade to "Basic" unless you do not intend to compile.
+1. From the [microsoft/vscode GitHub repository](https://github.com/microsoft/vscode), click on the **Code** dropdown, select **Open with Codespaces**, and then click on **New codespace**. If prompted, select the **Standard** machine size (which is also the default).
 
-1. From the [microsoft/vscode GitHub repository](https://github.com/microsoft/vscode), click on the **Code** dropdown, select **Open with Codespaces**, and the **New codespace**
+   > **Note:** You will not see these options within GitHub if you are not in the Codespaces beta.
 
-    > Note that you will not see these options if you are not in the beta yet.
+2. After the codespace is up and running in your browser, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Ports: Focus on Ports View**.
 
-2. After the codespace is up and running in your browser, press <kbd>F1</kbd> and select **Ports: Focus on Ports View**.
+3. You should see **VNC web client (6080)** under in the list of ports. Select the line and click on the globe icon to open it in a browser tab.
 
-3. You should see port `6080` under **Forwarded Ports**. Select the line and click on the globe icon to open it in a browser tab.
-
-    > If you do not see port `6080`, press <kbd>F1</kbd>, select **Forward a Port** and enter port `6080`.
+    > **Tip:** If you do not see the port, <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd>, select **Forward a Port** and enter port `6080`.
 
 4. In the new tab, you should see noVNC. Click **Connect** and enter `vscode` as the password.
 
-Anything you start in VS Code or the integrated terminal will appear here.
+Anything you start in VS Code, or the integrated terminal, will appear here.
 
 Next: **[Try it out!](#try-it)**
 
 ### Using VS Code with GitHub Codespaces
 
-You will likely see better performance when accessing the codespace you created from VS Code since you can use a[VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Here's how to do it.
+You may see improved VNC responsiveness when accessing a codespace from VS Code client since you can use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/). Here's how to do it.
+
+1.  Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the the [GitHub Codespaces extension](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces).
 
-1. [Create a codespace](#quick-start---github-codespaces) if you have not already.
+	> **Note:** The GitHub Codespaces extension requires the Visual Studio Code distribution of Code - OSS.
 
-2. Set up [VS Code for use with GitHub Codespaces](https://docs.github.com/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code)
+2. After the VS Code is up and running, press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd>, choose **Codespaces: Create New Codespace**, and use the following settings:
+    - `microsoft/vscode` for the repository.
+	- Select any branch (e.g. **main**) - you select a different one later.
+	- Choose **Standard** (4-core, 8GB) as the size.
 
-3. After the VS Code is up and running, press <kbd>F1</kbd>, choose **Codespaces: Connect to Codespace**, and select the codespace you created.
+4. After you have connected to the codespace, you can use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
 
-4. After you've connected to the codespace, use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password.
+    > **Tip:** You may also need change your VNC client's **Picture Quaility** setting to **High** to get a full color desktop.
 
-5. Anything you start in VS Code or the integrated terminal will appear here.
+5. Anything you start in VS Code, or the integrated terminal, will appear here.
 
 Next: **[Try it out!](#try-it)**
 
 ## Try it!
 
 This container uses the [Fluxbox](http://fluxbox.org/) window manager to keep things lean. **Right-click on the desktop** to see menu options. It works with GNOME and GTK applications, so other tools can be installed if needed.
 
-Note you can also set the resolution from the command line by typing `set-resolution`.
+> **Note:** You can also set the resolution from the command line by typing `set-resolution`.
 
 To start working with Code - OSS, follow these steps:
 
-1. In your local VS Code, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
+1. In your local VS Code client, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
 
     ```bash
     yarn install
     bash scripts/code.sh
     ```
 
-    Note that a previous run of `yarn install`  will already be cached, so this step should simply pick up any recent differences.
-
-2. After the build is complete, open a web browser or a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to the desktop environnement as described in the quick start and enter `vscode` as the password.
+2. After the build is complete, open a web browser or a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to the desktop environment as described in the quick start and enter `vscode` as the password.
 
 3. You should now see Code - OSS!
 
 Next, let's try debugging.
 
 1. Shut down Code - OSS by clicking the box in the upper right corner of the Code - OSS window through your browser or VNC viewer.
 
-2. Go to your local VS Code client, and use Run / Debug view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
+2. Go to your local VS Code client, and use the **Run / Debug** view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
 
     > **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../.vscode/launch.json). However, running `scripts/code.sh` first will set up Electron which will usually solve timeout issues.
 

@@ -3,20 +3,26 @@
 
 	// Image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
 	"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-main",
-
-	"workspaceMount": "source=${localWorkspaceFolder},target=/home/node/workspace/vscode,type=bind,consistency=cached",
-	"workspaceFolder": "/home/node/workspace/vscode",
 	"overrideCommand": false,
 	"runArgs": [ "--init", "--security-opt", "seccomp=unconfined"],
 
 	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash",
 		"resmon.show.battery": false,
 		"resmon.show.cpufreq": false
 	},
 
-	// noVNC, VNC, debug ports
-	"forwardPorts": [6080, 5901, 9222],
+	// noVNC, VNC
+	"forwardPorts": [6080, 5901],
+	"portsAttributes": {
+		"6080": {
+			"label": "VNC web client (noVNC)",
+			"onAutoForward": "silent"
+		},
+		"5901": {
+			"label": "VNC TCP port",
+			"onAutoForward": "silent"
+		}
+	},
 
 	"extensions": [
 		"dbaeumer.vscode-eslint",

@@ -16,7 +16,3 @@
 **/extensions/markdown-language-features/notebook-out/**
 **/extensions/typescript-basics/test/colorize-fixtures/**
 **/extensions/**/dist/**
-# These are code-server code symlinks.
-src/vs/base/node/proxy_agent.ts
-src/vs/ipc.d.ts
-src/vs/server/common/util.ts
@@ -62,7 +62,7 @@
 		"code-no-standalone-editor": "warn",
 		"code-no-unexternalized-strings": "warn",
 		"code-layering": [
-			"off",
+			"warn",
 			{
 				"common": [],
 				"node": [
@@ -88,7 +88,7 @@
 			}
 		],
 		"code-import-patterns": [
-			"off",
+			"warn",
 			// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 			// !!! Do not relax these rules !!!
 			// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -501,7 +501,7 @@
 					"**/vs/platform/**",
 					"**/vs/editor/**",
 					"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
-					"vs/workbench/contrib/files/common/editors/fileEditorInput",
+					"vs/workbench/contrib/files/browser/editors/fileEditorInput",
 					"**/vs/workbench/services/**",
 					"**/vs/workbench/test/**",
 					"*" // node modules

@@ -8,16 +8,15 @@ about: Create a report to help us improve
 <!-- 🔎 Search existing issues to avoid creating duplicates. -->
 <!-- 🧪 Test using the latest Insiders build to see if your issue has already been fixed: https://code.visualstudio.com/insiders/ -->
 <!-- 💡 Instead of creating your report here, use 'Report Issue' from the 'Help' menu in VS Code to pre-fill useful information. -->
+<!-- 🔧 Launch with `code --disable-extensions` to check. -->
+Does this issue occur when all extensions are disabled?: Yes/No
+
+<!-- 🪓 If you answered No above, use 'Help: Start Extension Bisect' from Command Palette to try to identify the cause. -->
+<!-- 📣 Issues caused by an extension need to be reported directly to the extension publisher. The 'Help > Report Issue' dialog can assist with this. -->
 - VS Code Version:
 - OS Version:
 
 Steps to Reproduce:
 
 1.
 2.
-
-<!-- 🔧 Launch with `code --disable-extensions` to check. -->
-Does this issue occur when all extensions are disabled?: Yes/No
-
-<!-- 🪓 If you answered No above, use 'Help: Start Extension Bisect' from Command Palette to try to identify the cause. -->
-<!-- 📣 Issues caused by an extension need to be reported directly to the extension publisher. The 'Help > Report Issue' dialog can assist with this. -->
@@ -1,16 +1,17 @@
 {
 	"$schema": "https://raw.githubusercontent.com/microsoft/vscode-github-triage-actions/master/classifier-deep/apply/apply-labels/deep-classifier-config.schema.json",
-	"vacation": [],
+	"vacation": ["RMacfarlane"],
 	"assignees": {
 		"JacksonKearl": {"accuracy": 0.5}
 	},
 	"labels": {
 		"L10N": {"assign": []},
 		"VIM": {"assign": []},
+		"accessibility": { "assign": ["isidorn"]},
 		"api": {"assign": ["jrieken"]},
 		"api-finalization": {"assign": []},
 		"api-proposal": {"assign": ["jrieken"]},
-		"authentication": {"assign": ["RMacfarlane"]},
+		"authentication": {"assign": ["TylerLeonhardt"]},
 		"breadcrumbs": {"assign": ["jrieken"]},
 		"callhierarchy": {"assign": ["jrieken"]},
 		"code-lens": {"assign": ["jrieken"]},
@@ -20,8 +21,7 @@
 		"context-keys": {"assign": []},
 		"css-less-scss": {"assign": ["aeschli"]},
 		"custom-editors": {"assign": ["mjbvz"]},
-		"debug": {"assign": ["isidorn"]},
-		"debug-console": {"assign": ["isidorn"]},
+		"debug": {"assign": ["weinand"]},
 		"dialogs": {"assign": ["sbatten"]},
 		"diff-editor": {"assign": []},
 		"dropdown": {"assign": []},
@@ -81,14 +81,15 @@
 		"icon-brand": {"assign": []},
 		"icons-product": {"assign": ["misolori"]},
 		"install-update": {"assign": []},
-		"integrated-terminal": {"assign": ["meganrogge"]},
-		"integrated-terminal-conpty": {"assign": ["meganrogge"]},
-		"integrated-terminal-links": {"assign": ["meganrogge"]},
+		"terminal": {"assign": ["meganrogge"]},
+		"terminal-conpty": {"assign": ["meganrogge"]},
+		"terminal-links": {"assign": ["meganrogge"]},
+		"terminal-external": {"assign": ["meganrogge"]},
 		"integration-test": {"assign": []},
 		"intellisense-config": {"assign": []},
 		"ipc": {"assign": ["joaomoreno"]},
 		"issue-bot": {"assign": ["chrmarti"]},
-		"issue-reporter": {"assign": ["RMacfarlane"]},
+		"issue-reporter": {"assign": ["TylerLeonhardt"]},
 		"javascript": {"assign": ["mjbvz"]},
 		"json": {"assign": ["aeschli"]},
 		"keybindings": {"assign": []},
@@ -113,7 +114,7 @@
 		"php": {"assign": ["roblourens"]},
 		"portable-mode": {"assign": ["joaomoreno"]},
 		"proxy": {"assign": []},
-		"quick-pick": {"assign": ["chrmarti"]},
+		"quick-pick": {"assign": ["TylerLeonhardt"]},
 		"references-viewlet": {"assign": ["jrieken"]},
 		"release-notes": {"assign": []},
 		"remote": {"assign": []},
@@ -152,7 +153,7 @@
 		"web": {"assign": ["bpasero"]},
 		"webview": {"assign": ["mjbvz"]},
 		"workbench-cli": {"assign": []},
-		"workbench-diagnostics": {"assign": ["RMacfarlane"]},
+		"workbench-diagnostics": {"assign": ["Tyriar"]},
 		"workbench-dnd": {"assign": ["bpasero"]},
 		"workbench-editor-grid": {"assign": ["sbatten"]},
 		"workbench-editors": {"assign": ["bpasero"]},

@@ -90,7 +90,7 @@
 			"@author"
 		],
 		"action": "updateLabels",
-		"addLabel": "z-author-verified",
+		"addLabel": "verified",
 		"removeLabel": "author-verification-requested",
 		"requireLabel": "author-verification-requested",
 		"disallowLabel": "unreleased"
@@ -133,6 +133,18 @@
 		"action": "updateLabels",
 		"addLabel": "~needs more info"
 	},
+	{
+		"type": "comment",
+		"name": "needsPerfInfo",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"addLabel": "needs more info",
+		"comment": "Thanks for creating this issue regarding performance! Please follow this guide to help us diagnose performance issues: https://github.com/microsoft/vscode/wiki/Performance-Issues \n\nHappy Coding!"
+	},
 	{
 		"type": "comment",
 		"name": "jsDebugLogs",

@@ -4,6 +4,7 @@
 		"rchiodo",
 		"greazer",
 		"donjayamanne",
-		"jilljac"
+		"jilljac",
+		"IanMatthewHuff"
 	]
 }
@@ -244,6 +244,9 @@ jobs:
       - name: Run Valid Layers Checks
         run: yarn valid-layers-check
 
+      - name: Compile /build/
+        run: yarn --cwd build compile
+
       - name: Run Monaco Editor Checks
         run: yarn monaco-compile-check
 

@@ -7,7 +7,8 @@ node_modules/
 extensions/**/dist/
 /out*/
 /extensions/**/out/
-# src/vs/server NOTE@coder: So our code isn't ignored.
+# NOTE@coder: remove to provide our own server
+#src/vs/server
 resources/server
 build/node_modules
 coverage/

@@ -2,37 +2,31 @@
   {
     "kind": 1,
     "language": "markdown",
-    "value": "#### Config",
-    "editable": true
+    "value": "#### Config"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"April 2021\"",
-    "editable": true
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"May 2021\""
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "### Finalization",
-    "editable": true
+    "value": "### Finalization"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo $milestone label:api-finalization",
-    "editable": true
+    "value": "$repo $milestone label:api-finalization"
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "### Proposals",
-    "editable": true
+    "value": "### Proposals"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo $milestone is:open label:api-proposal ",
-    "editable": true
+    "value": "$repo $milestone is:open label:api-proposal "
   }
 ]
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub\n\n$MILESTONE=milestone:\"April 2021\""
+    "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub\n\n$MILESTONE=milestone:\"May 2021\""
   },
   {
     "kind": 1,