Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Add vsls to schemes to support Live Share #3100

Merged
merged 2 commits into from Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/_includes/generated-docs/configuration.md
Expand Up @@ -802,7 +802,7 @@ Description
- `vscode-scm` - Needed to spell check Source Control commit messages.

Default
: [ _`"file"`_, _`"gist"`_, _`"repo"`_, _`"sftp"`_, _`"untitled"`_, _`"vscode-notebook-cell"`_, _`"vscode-scm"`_, _`"vscode-userdata"`_, _`"vscode-vfs"`_ ]
: [ _`"file"`_, _`"gist"`_, _`"repo"`_, _`"sftp"`_, _`"untitled"`_, _`"vscode-notebook-cell"`_, _`"vscode-scm"`_, _`"vscode-userdata"`_, _`"vscode-vfs"`_, _`"vsls"`_ ]

---

Expand Down
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -1579,7 +1579,8 @@
"vscode-notebook-cell",
"vscode-scm",
"vscode-userdata",
"vscode-vfs"
"vscode-vfs",
"vsls"
],
"items": {
"type": "string"
Expand Down
3 changes: 2 additions & 1 deletion packages/_server/spell-checker-config.schema.json
Expand Up @@ -1099,7 +1099,8 @@
"vscode-notebook-cell",
"vscode-scm",
"vscode-userdata",
"vscode-vfs"
"vscode-vfs",
"vsls"
],
"description": "Control which file schemas will be checked for spelling (VS Code must be restarted for this setting to take effect).\n\n\nSome schemas have special meaning like:\n- `untitled` - Used for new documents that have not yet been saved\n- `vscode-notebook-cell` - Used for validating segments of a Notebook.\n- `vscode-userdata` - Needed to spell check `.code-snippets`\n- `vscode-scm` - Needed to spell check Source Control commit messages.",
"items": {
Expand Down
Expand Up @@ -83,7 +83,7 @@ export interface SpellCheckerSettings extends SpellCheckerShouldCheckDocSettings
* - `vscode-scm` - Needed to spell check Source Control commit messages.
* @title Define Allowed Schemas
* @scope window
* @default ["file", "gist", "repo", "sftp", "untitled", "vscode-notebook-cell", "vscode-scm", "vscode-userdata", "vscode-vfs"]
* @default ["file", "gist", "repo", "sftp", "untitled", "vscode-notebook-cell", "vscode-scm", "vscode-userdata", "vscode-vfs", "vsls"]
*/
allowedSchemas?: string[];

Expand Down
11 changes: 10 additions & 1 deletion packages/_server/src/config/documentSettings.mts
Expand Up @@ -101,7 +101,16 @@ const defaultExclude: Glob[] = [
'__pycache__/**', // ignore cache files. cspell:ignore pycache
];

const defaultAllowedSchemes = ['gist', 'repo', 'file', 'sftp', 'untitled', 'vscode-notebook-cell', 'vscode-vfs'];
const defaultAllowedSchemes = [
'gist',
'repo',
'file',
'sftp',
'untitled',
'vscode-notebook-cell',
'vscode-vfs', // Visual Studio Remote File System
'vsls', // Visual Studio Live Share
];
const schemeBlockList = ['git', 'output', 'debug'];

const defaultRootUri = toFileUri(process.cwd()).toString();
Expand Down