Skip to content

Commit 69a7d45

Browse files
author
Jackson Kearl
committed
Merge branch 'main' into pr/yume-chan/135632
2 parents 4887157 + 98da73d commit 69a7d45

File tree

3,679 files changed

+237676
-132790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,679 files changed

+237676
-132790
lines changed

.devcontainer/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ You may see improved VNC responsiveness when accessing a codespace from VS Code
5858
5959
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:
6060
- `microsoft/vscode` for the repository.
61-
- Select any branch (e.g. **main**) - you select a different one later.
61+
- Select any branch (e.g. **main**) - you can select a different one later.
6262
- Choose **Standard** (4-core, 8GB) as the size.
6363

6464
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.
6565

66-
> **Tip:** You may also need change your VNC client's **Picture Quaility** setting to **High** to get a full color desktop.
66+
> **Tip:** You may also need change your VNC client's **Picture Quality** setting to **High** to get a full color desktop.
6767
6868
5. Anything you start in VS Code, or the integrated terminal, will appear here.
6969

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
55
"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-main",
66
"overrideCommand": false,
7-
"runArgs": [ "--init", "--security-opt", "seccomp=unconfined"],
7+
"runArgs": [ "--init", "--security-opt", "seccomp=unconfined", "--shm-size=1g"],
88

99
"settings": {
1010
"resmon.show.battery": false,

.eslintignore

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
1-
**/vs/nls.build.js
2-
**/vs/nls.js
3-
**/vs/css.build.js
4-
**/vs/css.js
5-
**/vs/loader.js
6-
**/dompurify/**
7-
**/marked/**
8-
**/semver/**
9-
**/test/**/*.js
10-
**/node_modules/**
11-
**/vscode-api-tests/testWorkspace/**
12-
**/vscode-api-tests/testWorkspace2/**
13-
**/extensions/**/out/**
1+
**/build/*/**/*.js
2+
**/dist/**/*.js
3+
**/extensions/**/*.d.ts
144
**/extensions/**/build/**
5+
**/extensions/**/colorize-fixtures/**
6+
**/extensions/css-language-features/server/test/pathCompletionFixtures/**
7+
**/extensions/html-language-features/server/lib/jquery.d.ts
8+
**/extensions/html-language-features/server/src/test/pathCompletionFixtures/**
159
**/extensions/markdown-language-features/media/**
1610
**/extensions/markdown-language-features/notebook-out/**
17-
**/extensions/typescript-basics/test/colorize-fixtures/**
18-
**/extensions/**/dist/**
11+
**/extensions/markdown-math/notebook-out/**
12+
**/extensions/simple-browser/media/index.js
1913
**/extensions/typescript-language-features/test-workspace/**
20-
21-
# These files are not linted by `yarn eslint`, so we exclude them from being linted in the editor.
22-
# This ensures that if we add new rules and they pass CI, there are also no errors in the editor.
23-
/resources/web/code-web.js
14+
**/extensions/vscode-api-tests/testWorkspace/**
15+
**/extensions/vscode-api-tests/testWorkspace2/**
16+
**/fixtures/**
17+
**/node_modules/**
18+
**/out-*/**/*.js
19+
**/out-editor-*/**
20+
**/out/**/*.js
21+
**/src/**/dompurify.js
22+
**/src/**/marked.js
23+
**/src/**/semver.js
24+
**/src/typings/**/*.d.ts
25+
**/src/vs/*/**/*.d.ts
26+
**/src/vs/base/test/common/filters.perf.data.js
27+
**/src/vs/css.build.js
28+
**/src/vs/css.js
29+
**/src/vs/loader.js
30+
**/src/vs/nls.build.js
31+
**/src/vs/nls.js
32+
**/test/unit/assert.js
33+
**/typings/**

0 commit comments

Comments
 (0)