Skip to content

Commit f0860a5

Browse files
authored
Merge pull request #26 from microsoft/vnext
Fix incorrect merge for private docs repo
2 parents fc0f977 + 48a9489 commit f0860a5

File tree

265 files changed

+1
-19666
lines changed

Some content is hidden

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

265 files changed

+1
-19666
lines changed

.husky/pre-commit

100644100755
File mode changed.

api/advanced-topics/extension-host.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,7 @@
11
---
22
# DO NOT TOUCH — Managed by doc writer
33
ContentId: 106AA11C-DB26-493A-9E3C-16F513B2AEC8
4-
<<<<<<< HEAD
5-
<<<<<<< HEAD
6-
<<<<<<< HEAD
7-
<<<<<<< HEAD
8-
<<<<<<< HEAD
9-
<<<<<<< HEAD
10-
<<<<<<< HEAD
11-
<<<<<<< HEAD
12-
DateApproved: 10/03/2024
13-
=======
144
DateApproved: 10/29/2024
15-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
16-
=======
17-
DateApproved: 10/29/2024
18-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
19-
=======
20-
DateApproved: 10/29/2024
21-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
22-
=======
23-
DateApproved: 10/29/2024
24-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
25-
=======
26-
DateApproved: 10/29/2024
27-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
28-
=======
29-
DateApproved: 10/29/2024
30-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
31-
=======
32-
DateApproved: 10/29/2024
33-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
34-
=======
35-
DateApproved: 10/29/2024
36-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
375

386
# Summarize the whole topic in less than 300 characters for SEO purpose
397
MetaDescription: The Visual Studio Code Extension Host is responsible for managing extensions and ensuring the stability and performance of Visual Studio Code.

api/advanced-topics/remote-extensions.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,6 @@
11
---
22
ContentId: 5c708951-e566-42db-9d97-e9715d95cdd1
3-
<<<<<<< HEAD
4-
<<<<<<< HEAD
5-
<<<<<<< HEAD
6-
<<<<<<< HEAD
7-
<<<<<<< HEAD
8-
<<<<<<< HEAD
9-
<<<<<<< HEAD
10-
<<<<<<< HEAD
11-
DateApproved: 10/03/2024
12-
=======
133
DateApproved: 10/29/2024
14-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
15-
=======
16-
DateApproved: 10/29/2024
17-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
18-
=======
19-
DateApproved: 10/29/2024
20-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
21-
=======
22-
DateApproved: 10/29/2024
23-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
24-
=======
25-
DateApproved: 10/29/2024
26-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
27-
=======
28-
DateApproved: 10/29/2024
29-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
30-
=======
31-
DateApproved: 10/29/2024
32-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
33-
=======
34-
DateApproved: 10/29/2024
35-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
364

375
# Summarize the whole topic in less than 300 characters for SEO purpose
386
MetaDescription: A guide to adding Visual Studio Code Remote Development and GitHub Codespaces support to extensions

api/advanced-topics/tslint-eslint-migration.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,6 @@
11
---
22
ContentId: f00c4913-58e3-4a61-aa42-e769c3430906
3-
<<<<<<< HEAD
4-
<<<<<<< HEAD
5-
<<<<<<< HEAD
6-
<<<<<<< HEAD
7-
<<<<<<< HEAD
8-
<<<<<<< HEAD
9-
<<<<<<< HEAD
10-
<<<<<<< HEAD
11-
DateApproved: 10/03/2024
12-
=======
133
DateApproved: 10/29/2024
14-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
15-
=======
16-
DateApproved: 10/29/2024
17-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
18-
=======
19-
DateApproved: 10/29/2024
20-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
21-
=======
22-
DateApproved: 10/29/2024
23-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
24-
=======
25-
DateApproved: 10/29/2024
26-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
27-
=======
28-
DateApproved: 10/29/2024
29-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
30-
=======
31-
DateApproved: 10/29/2024
32-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
33-
=======
34-
DateApproved: 10/29/2024
35-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
364

375
# Summarize the whole topic in less than 300 characters for SEO purpose
386
MetaDescription: A guide to migrating extension projects from the TSLint linter to ESLint.

api/advanced-topics/using-proposed-api.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,7 @@
11
---
22
# DO NOT TOUCH — Managed by doc writer
33
ContentId: f4d4e9e0-8901-405c-aaf5-faa16c32588b
4-
<<<<<<< HEAD
5-
<<<<<<< HEAD
6-
<<<<<<< HEAD
7-
<<<<<<< HEAD
8-
<<<<<<< HEAD
9-
<<<<<<< HEAD
10-
<<<<<<< HEAD
11-
<<<<<<< HEAD
12-
DateApproved: 10/03/2024
13-
=======
144
DateApproved: 10/29/2024
15-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
16-
=======
17-
DateApproved: 10/29/2024
18-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
19-
=======
20-
DateApproved: 10/29/2024
21-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
22-
=======
23-
DateApproved: 10/29/2024
24-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
25-
=======
26-
DateApproved: 10/29/2024
27-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
28-
=======
29-
DateApproved: 10/29/2024
30-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
31-
=======
32-
DateApproved: 10/29/2024
33-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
34-
=======
35-
DateApproved: 10/29/2024
36-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
375

386
# Summarize the whole topic in less than 300 characters for SEO purpose
397
MetaDescription: Use Visual Studio Code's Proposed API

api/extension-capabilities/common-capabilities.md

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,7 @@
11
---
22
# DO NOT TOUCH — Managed by doc writer
33
ContentId: 9c48dfbf-e49d-4f33-aadc-5ebf06d5dde0
4-
<<<<<<< HEAD
5-
<<<<<<< HEAD
6-
<<<<<<< HEAD
7-
<<<<<<< HEAD
8-
<<<<<<< HEAD
9-
<<<<<<< HEAD
10-
<<<<<<< HEAD
11-
<<<<<<< HEAD
12-
DateApproved: 10/03/2024
13-
=======
144
DateApproved: 10/29/2024
15-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
16-
=======
17-
DateApproved: 10/29/2024
18-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
19-
=======
20-
DateApproved: 10/29/2024
21-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
22-
=======
23-
DateApproved: 10/29/2024
24-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
25-
=======
26-
DateApproved: 10/29/2024
27-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
28-
=======
29-
DateApproved: 10/29/2024
30-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
31-
=======
32-
DateApproved: 10/29/2024
33-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
34-
=======
35-
DateApproved: 10/29/2024
36-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
375

386
# Summarize the whole topic in less than 300 characters for SEO purpose
397
MetaDescription: Common capabilities that Visual Studio Code extensions (plug-ins) can take advantage of
@@ -68,76 +36,13 @@ An extension can register custom Context Menu items that will be displayed in di
6836

6937
## Data Storage
7038

71-
<<<<<<< HEAD
72-
<<<<<<< HEAD
73-
<<<<<<< HEAD
74-
<<<<<<< HEAD
75-
<<<<<<< HEAD
76-
<<<<<<< HEAD
77-
<<<<<<< HEAD
78-
<<<<<<< HEAD
79-
There are four options for storing data:
80-
=======
81-
There are five options for storing data:
82-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
83-
=======
84-
There are five options for storing data:
85-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
86-
=======
87-
There are five options for storing data:
88-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
89-
=======
90-
There are five options for storing data:
91-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
92-
=======
9339
There are five options for storing data:
94-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
95-
=======
96-
There are five options for storing data:
97-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
98-
=======
99-
There are five options for storing data:
100-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
101-
=======
102-
There are five options for storing data:
103-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
10440

10541
- [`ExtensionContext.workspaceState`](/api/references/vscode-api#ExtensionContext.workspaceState): A workspace storage where you can write key/value pairs. VS Code manages the storage and will restore it when the same workspace is opened again.
10642
- [`ExtensionContext.globalState`](/api/references/vscode-api#ExtensionContext.globalState): A global storage where you can write key/value pairs. VS Code manages the storage and will restore it for each extension activation. You can selectively synchronize key/value pairs in global storage by setting the keys for sync using `setKeysForSync` method on `globalState`.
10743
- [`ExtensionContext.storageUri`](/api/references/vscode-api#ExtensionContext.storageUri): A workspace specific storage URI pointing to a local directory where your extension has read/write access. This is a good option if you need to store large files that are accessible only from the current workspace.
10844
- [`ExtensionContext.globalStorageUri`](/api/references/vscode-api#ExtensionContext.globalStorageUri): A global storage URI pointing to a local directory where your extension has read/write access. This is a good option if you need to store large files that are accessible from all workspaces.
109-
<<<<<<< HEAD
110-
<<<<<<< HEAD
111-
<<<<<<< HEAD
112-
<<<<<<< HEAD
113-
<<<<<<< HEAD
114-
<<<<<<< HEAD
115-
<<<<<<< HEAD
116-
<<<<<<< HEAD
117-
=======
118-
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
119-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
120-
=======
121-
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
122-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
123-
=======
124-
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
125-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
126-
=======
127-
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
128-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
129-
=======
130-
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
131-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
132-
=======
133-
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
134-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
135-
=======
136-
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
137-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
138-
=======
13945
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
140-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
14146

14247
The extension context is available to the `activate` function in the [Extension Entry File](/api/get-started/extension-anatomy#extension-entry-file).
14348

api/extension-capabilities/extending-workbench.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,7 @@
11
---
22
# DO NOT TOUCH — Managed by doc writer
33
ContentId: e0d5bd37-f020-4235-ad81-c977baaeb24f
4-
<<<<<<< HEAD
5-
<<<<<<< HEAD
6-
<<<<<<< HEAD
7-
<<<<<<< HEAD
8-
<<<<<<< HEAD
9-
<<<<<<< HEAD
10-
<<<<<<< HEAD
11-
<<<<<<< HEAD
12-
DateApproved: 10/03/2024
13-
=======
144
DateApproved: 10/29/2024
15-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
16-
=======
17-
DateApproved: 10/29/2024
18-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
19-
=======
20-
DateApproved: 10/29/2024
21-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
22-
=======
23-
DateApproved: 10/29/2024
24-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
25-
=======
26-
DateApproved: 10/29/2024
27-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
28-
=======
29-
DateApproved: 10/29/2024
30-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
31-
=======
32-
DateApproved: 10/29/2024
33-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
34-
=======
35-
DateApproved: 10/29/2024
36-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
375

386
# Summarize the whole topic in less than 300 characters for SEO purpose
397
MetaDescription: Explain how to extend Visual Studio Code's workbench area with custom UI components

api/extension-capabilities/overview.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,7 @@
11
---
22
# DO NOT TOUCH — Managed by doc writer
33
ContentId: d22675fc-6609-43f2-a66b-8f2a52597195
4-
<<<<<<< HEAD
5-
<<<<<<< HEAD
6-
<<<<<<< HEAD
7-
<<<<<<< HEAD
8-
<<<<<<< HEAD
9-
<<<<<<< HEAD
10-
<<<<<<< HEAD
11-
<<<<<<< HEAD
12-
DateApproved: 10/03/2024
13-
=======
144
DateApproved: 10/29/2024
15-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
16-
=======
17-
DateApproved: 10/29/2024
18-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
19-
=======
20-
DateApproved: 10/29/2024
21-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
22-
=======
23-
DateApproved: 10/29/2024
24-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
25-
=======
26-
DateApproved: 10/29/2024
27-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
28-
=======
29-
DateApproved: 10/29/2024
30-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
31-
=======
32-
DateApproved: 10/29/2024
33-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
34-
=======
35-
DateApproved: 10/29/2024
36-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
375

386
# Summarize the whole topic in less than 300 characters for SEO purpose
397
MetaDescription: Learn the details of what's possible with Visual Studio Code's rich extension (plug-in) API.

api/extension-capabilities/theming.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,7 @@
11
---
22
# DO NOT TOUCH — Managed by doc writer
33
ContentId: 37b6ae0a-d1b5-48b6-9bd4-9b50ef11d573
4-
<<<<<<< HEAD
5-
<<<<<<< HEAD
6-
<<<<<<< HEAD
7-
<<<<<<< HEAD
8-
<<<<<<< HEAD
9-
<<<<<<< HEAD
10-
<<<<<<< HEAD
11-
<<<<<<< HEAD
12-
DateApproved: 10/03/2024
13-
=======
144
DateApproved: 10/29/2024
15-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
16-
=======
17-
DateApproved: 10/29/2024
18-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
19-
=======
20-
DateApproved: 10/29/2024
21-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
22-
=======
23-
DateApproved: 10/29/2024
24-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
25-
=======
26-
DateApproved: 10/29/2024
27-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
28-
=======
29-
DateApproved: 10/29/2024
30-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
31-
=======
32-
DateApproved: 10/29/2024
33-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
34-
=======
35-
DateApproved: 10/29/2024
36-
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
375

386
# Summarize the whole topic in less than 300 characters for SEO purpose
397
MetaDescription: Learn how to add custom themes for colors and icons in Visual Studio Code.

0 commit comments

Comments
 (0)