@codingame/monaco-vscode-snippets-service-override 25.1.2 → 26.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-snippets-service-override",
-  "version": "25.1.2",
+  "version": "26.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - snippets service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "25.1.2",
-    "@codingame/monaco-vscode-files-service-override": "25.1.2"
+    "@codingame/monaco-vscode-api": "26.0.1",
+    "@codingame/monaco-vscode-files-service-override": "26.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.js

@@ -4,16 +4,22 @@ import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 
 const defaultOptions = {
-    category: ( localize2(10967, "Snippets")),
+    category: ( localize2(11286, "Snippets"))
 };
 class SnippetsAction extends Action2 {
     constructor(desc) {
-        super({ ...defaultOptions, ...desc });
+        super({
+            ...defaultOptions,
+            ...desc
+        });
     }
 }
 class SnippetEditorAction extends EditorAction2 {
     constructor(desc) {
-        super({ ...defaultOptions, ...desc });
+        super({
+            ...defaultOptions,
+            ...desc
+        });
     }
 }
 

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.js

@@ -19,7 +19,7 @@ import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 
 var ISnippetPick;
-(function (ISnippetPick) {
+(function(ISnippetPick) {
     function is(thing) {
         return !!thing && URI.isUri(thing.filepath);
     }
@@ -38,7 +38,8 @@ async function computePicks(snippetService, userDataProfileService, languageServ
             await file.load();
             const names = ( new Set());
             let source;
-            outer: for (const snippet of file.data) {
+            outer:
+            for (const snippet of file.data) {
                 if (!source) {
                     source = snippet.source;
                 }
@@ -48,8 +49,7 @@ async function computePicks(snippetService, userDataProfileService, languageServ
                         if (names.size >= 4) {
                             names.add(`${name}...`);
                             break outer;
-                        }
-                        else {
+                        } else {
                             names.add(name);
                         }
                     }
@@ -58,29 +58,26 @@ async function computePicks(snippetService, userDataProfileService, languageServ
             const snippet = {
                 label: basename(file.location),
                 filepath: file.location,
-                description: names.size === 0
-                    ? ( localize(10968, "(global)"))
-                    : ( localize(10969, "({0})", [...names].join(', ')))
+                description: names.size === 0 ? ( localize(11287, "(global)")) : ( localize(11288, "({0})", [...names].join(", ")))
             };
             existing.push(snippet);
             if (!source) {
                 continue;
             }
-            const detail = ( localize(
-                10970,
-                "({0}) {1}",
-                source,
-                labelService.getUriLabel(file.location, { relative: true })
-            ));
+            const detail = ( localize(11289, "({0}) {1}", source, labelService.getUriLabel(file.location, {
+                relative: true
+            })));
             const lastItem = added.get(basename(file.location));
             if (lastItem) {
                 snippet.detail = detail;
                 lastItem.snippet.detail = lastItem.detail;
             }
-            added.set(basename(file.location), { snippet, detail });
-        }
-        else {
-            const mode = basename(file.location).replace(/\.json$/, '');
+            added.set(basename(file.location), {
+                snippet,
+                detail
+            });
+        } else {
+            const mode = basename(file.location).replace(/\.json$/, "");
             existing.push({
                 label: basename(file.location),
                 description: `(${languageService.getLanguageName(mode) ?? mode})`,
@@ -107,38 +104,44 @@ async function computePicks(snippetService, userDataProfileService, languageServ
         const b_ext = extname(b.filepath.path);
         if (a_ext === b_ext) {
             return a.label.localeCompare(b.label);
-        }
-        else if (a_ext === '.code-snippets') {
+        } else if (a_ext === ".code-snippets") {
             return -1;
-        }
-        else {
+        } else {
             return 1;
         }
     });
     future.sort((a, b) => {
         return a.label.localeCompare(b.label);
     });
-    return { existing, future };
+    return {
+        existing,
+        future
+    };
 }
-async function createSnippetFile(scope, defaultPath, quickInputService, fileService, textFileService, opener) {
+async function createSnippetFile(
+    scope,
+    defaultPath,
+    quickInputService,
+    fileService,
+    textFileService,
+    opener
+) {
     function createSnippetUri(input) {
-        const filename = extname(input) !== '.code-snippets'
-            ? `${input}.code-snippets`
-            : input;
+        const filename = extname(input) !== ".code-snippets" ? `${input}.code-snippets` : input;
         return joinPath(defaultPath, filename);
     }
     await fileService.createFolder(defaultPath);
     const input = await quickInputService.input({
-        placeHolder: ( localize(10971, "Type snippet file name")),
+        placeHolder: ( localize(11290, "Type snippet file name")),
         async validateInput(input) {
             if (!input) {
-                return localize(10972, "Invalid file name");
+                return localize(11291, "Invalid file name");
             }
             if (!isValidBasename(input)) {
-                return localize(10973, "'{0}' is not a valid file name", input);
+                return localize(11292, "'{0}' is not a valid file name", input);
             }
             if (await fileService.exists(createSnippetUri(input))) {
-                return localize(10974, "'{0}' already exists", input);
+                return localize(11293, "'{0}' already exists", input);
             }
             return undefined;
         }
@@ -148,25 +151,35 @@ async function createSnippetFile(scope, defaultPath, quickInputService, fileServ
     }
     const resource = createSnippetUri(input);
     await textFileService.write(resource, [
-        '{',
-        '\t// Place your ' + scope + ' snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and ',
-        '\t// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope ',
-        '\t// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is ',
-        '\t// used to trigger the snippet and the body will be expanded and inserted. Possible variables are: ',
-        '\t// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. ',
-        '\t// Placeholders with the same ids are connected.',
-        '\t// Example:',
-        '\t// "Print to console": {',
-        '\t// \t"scope": "javascript,typescript",',
-        '\t// \t"prefix": "log",',
-        '\t// \t"body": [',
-        '\t// \t\t"console.log(\'$1\');",',
-        '\t// \t\t"$2"',
-        '\t// \t],',
-        '\t// \t"description": "Log output to console"',
-        '\t// }',
-        '}'
-    ].join('\n'));
+        "{",
+        "\t// Place your " + scope + " snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and ",
+        "\t// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope ",
+        "\t// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is ",
+        "\t// used to trigger the snippet and the body will be expanded and inserted. Possible variables are: ",
+        "\t// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. ",
+        "\t// Placeholders with the same ids are connected.",
+        "\t// Example:",
+        "\t// \"Print to console\": {",
+        "\t// \t\"scope\": \"javascript,typescript\",",
+        "\t// \t\"prefix\": \"log\",",
+        "\t// \t\"body\": [",
+        "\t// \t\t\"console.log('$1');\",",
+        "\t// \t\t\"$2\"",
+        "\t// \t],",
+        "\t// \t\"description\": \"Log output to console\"",
+        "\t// }",
+        "\t//",
+        "\t// You can also restrict snippets to specific files using include/exclude patterns:",
+        "\t// \"Test snippet\": {",
+        "\t// \t\"scope\": \"javascript,typescript\",",
+        "\t// \t\"prefix\": \"test\",",
+        "\t// \t\"body\": \"test('$1', () => {\\n\\t$0\\n});\",",
+        "\t// \t\"include\": [\"**/*.test.ts\", \"*.spec.ts\"],",
+        "\t// \t\"exclude\": [\"**/temp/*.ts\"],",
+        "\t// \t\"description\": \"Insert test block\"",
+        "\t// }",
+        "}"
+    ].join("\n"));
     await opener.open(resource);
     return undefined;
 }
@@ -175,38 +188,52 @@ async function createLanguageSnippetFile(pick, fileService, textFileService) {
         return;
     }
     const contents = [
-        '{',
-        '\t// Place your snippets for ' + pick.label + ' here. Each snippet is defined under a snippet name and has a prefix, body and ',
-        '\t// description. The prefix is what is used to trigger the snippet and the body will be expanded and inserted. Possible variables are:',
-        '\t// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. Placeholders with the ',
-        '\t// same ids are connected.',
-        '\t// Example:',
-        '\t// "Print to console": {',
-        '\t// \t"prefix": "log",',
-        '\t// \t"body": [',
-        '\t// \t\t"console.log(\'$1\');",',
-        '\t// \t\t"$2"',
-        '\t// \t],',
-        '\t// \t"description": "Log output to console"',
-        '\t// }',
-        '}'
-    ].join('\n');
+        "{",
+        "\t// Place your snippets for " + pick.label + " here. Each snippet is defined under a snippet name and has a prefix, body and ",
+        "\t// description. The prefix is what is used to trigger the snippet and the body will be expanded and inserted. Possible variables are:",
+        "\t// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. Placeholders with the ",
+        "\t// same ids are connected.",
+        "\t// Example:",
+        "\t// \"Print to console\": {",
+        "\t// \t\"prefix\": \"log\",",
+        "\t// \t\"body\": [",
+        "\t// \t\t\"console.log('$1');\",",
+        "\t// \t\t\"$2\"",
+        "\t// \t],",
+        "\t// \t\"description\": \"Log output to console\"",
+        "\t// }",
+        "\t//",
+        "\t// You can also restrict snippets to specific files using include/exclude patterns:",
+        "\t// \"Test snippet\": {",
+        "\t// \t\"prefix\": \"test\",",
+        "\t// \t\"body\": \"test('$1', () => {\\n\\t$0\\n});\",",
+        "\t// \t\"include\": [\"**/*.test.ts\", \"*.spec.ts\"],",
+        "\t// \t\"exclude\": [\"**/temp/*.ts\"],",
+        "\t// \t\"description\": \"Insert test block\"",
+        "\t// }",
+        "}"
+    ].join("\n");
     await textFileService.write(pick.filepath, contents);
 }
 class ConfigureSnippetsAction extends SnippetsAction {
     constructor() {
         super({
-            id: 'workbench.action.openSnippets',
-            title: ( localize2(10975, "Configure Snippets")),
+            id: "workbench.action.openSnippets",
+            title: ( localize2(11294, "Configure Snippets")),
             shortTitle: {
-                ...( localize2(10976, "Snippets")),
-                mnemonicTitle: ( localize(10977, "&&Snippets")),
+                ...( localize2(11295, "Snippets")),
+                mnemonicTitle: ( localize(11296, "&&Snippets"))
             },
             f1: true,
-            menu: [
-                { id: MenuId.MenubarPreferencesMenu, group: '2_configuration', order: 5 },
-                { id: MenuId.GlobalActivity, group: '2_configuration', order: 5 },
-            ]
+            menu: [{
+                id: MenuId.MenubarPreferencesMenu,
+                group: "2_configuration",
+                order: 5
+            }, {
+                id: MenuId.GlobalActivity,
+                group: "2_configuration",
+                order: 5
+            }]
         });
     }
     async run(accessor) {
@@ -222,36 +249,59 @@ class ConfigureSnippetsAction extends SnippetsAction {
         const picks = await computePicks(snippetService, userDataProfileService, languageService, labelService);
         const existing = picks.existing;
         const globalSnippetPicks = [{
-                scope: ( localize(10978, 'global')),
-                label: ( localize(10979, "New Global Snippets file...")),
-                uri: userDataProfileService.currentProfile.snippetsHome
-            }];
+            scope: ( localize(11297, "global")),
+            label: ( localize(11298, "New Global Snippets file...")),
+            uri: userDataProfileService.currentProfile.snippetsHome
+        }];
         const workspaceSnippetPicks = [];
         for (const folder of workspaceService.getWorkspace().folders) {
             workspaceSnippetPicks.push({
-                scope: ( localize(10980, "{0} workspace", folder.name)),
-                label: ( localize(10981, "New Snippets file for '{0}'...", folder.name)),
-                uri: folder.toResource('.vscode')
+                scope: ( localize(11299, "{0} workspace", folder.name)),
+                label: ( localize(11300, "New Snippets file for '{0}'...", folder.name)),
+                uri: folder.toResource(".vscode")
             });
         }
         if (existing.length > 0) {
-            existing.unshift({ type: 'separator', label: ( localize(10982, "Existing Snippets")) });
-            existing.push({ type: 'separator', label: ( localize(10983, "New Snippets")) });
-        }
-        else {
-            existing.push({ type: 'separator', label: ( localize(10983, "New Snippets")) });
+            existing.unshift({
+                type: "separator",
+                label: ( localize(11301, "Existing Snippets"))
+            });
+            existing.push({
+                type: "separator",
+                label: ( localize(11302, "New Snippets"))
+            });
+        } else {
+            existing.push({
+                type: "separator",
+                label: ( localize(11302, "New Snippets"))
+            });
         }
-        const pick = await quickInputService.pick([].concat(existing, globalSnippetPicks, workspaceSnippetPicks, picks.future), {
-            placeHolder: ( localize(10984, "Select Snippets File or Create Snippets")),
-            matchOnDescription: true
-        });
+        const pick = await quickInputService.pick(
+            [].concat(existing, globalSnippetPicks, workspaceSnippetPicks, picks.future),
+            {
+                placeHolder: ( localize(11303, "Select Snippets File or Create Snippets")),
+                matchOnDescription: true
+            }
+        );
         if (globalSnippetPicks.indexOf(pick) >= 0) {
-            return createSnippetFile(pick.scope, pick.uri, quickInputService, fileService, textFileService, opener);
-        }
-        else if (workspaceSnippetPicks.indexOf(pick) >= 0) {
-            return createSnippetFile(pick.scope, pick.uri, quickInputService, fileService, textFileService, opener);
-        }
-        else if (ISnippetPick.is(pick)) {
+            return createSnippetFile(
+                pick.scope,
+                pick.uri,
+                quickInputService,
+                fileService,
+                textFileService,
+                opener
+            );
+        } else if (workspaceSnippetPicks.indexOf(pick) >= 0) {
+            return createSnippetFile(
+                pick.scope,
+                pick.uri,
+                quickInputService,
+                fileService,
+                textFileService,
+                opener
+            );
+        } else if (ISnippetPick.is(pick)) {
             if (pick.hint) {
                 await createLanguageSnippetFile(pick, fileService, textFileService);
             }

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.js

@@ -11,12 +11,14 @@ import { ISnippetsService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 class ApplyFileSnippetAction extends SnippetsAction {
-    static { this.Id = 'workbench.action.populateFileFromSnippet'; }
+    static {
+        this.Id = "workbench.action.populateFileFromSnippet";
+    }
     constructor() {
         super({
             id: ApplyFileSnippetAction.Id,
-            title: ( localize2(10985, "Fill File with Snippet")),
-            f1: true,
+            title: ( localize2(11304, "Fill File with Snippet")),
+            f1: true
         });
     }
     async run(accessor) {
@@ -28,7 +30,12 @@ class ApplyFileSnippetAction extends SnippetsAction {
         if (!editor || !editor.hasModel()) {
             return;
         }
-        const snippets = await snippetService.getSnippets(undefined, { fileTemplateSnippets: true, noRecencySort: true, includeNoPrefixSnippets: true });
+        const resourceUri = editor.getModel().uri;
+        const snippets = await snippetService.getSnippets(undefined, resourceUri, {
+            fileTemplateSnippets: true,
+            noRecencySort: true,
+            includeNoPrefixSnippets: true
+        });
         if (snippets.length === 0) {
             return;
         }
@@ -38,9 +45,9 @@ class ApplyFileSnippetAction extends SnippetsAction {
         }
         if (editor.hasModel()) {
             SnippetController2.get(editor)?.apply([{
-                    range: editor.getModel().getFullModelRange(),
-                    template: selection.snippet.body
-                }]);
+                range: editor.getModel().getFullModelRange(),
+                template: selection.snippet.body
+            }]);
             editor.getModel().setLanguage(langService.createById(selection.langId), ApplyFileSnippetAction.Id);
             editor.focus();
         }
@@ -49,11 +56,16 @@ class ApplyFileSnippetAction extends SnippetsAction {
         const all = [];
         for (const snippet of snippets) {
             if (isFalsyOrEmpty(snippet.scopes)) {
-                all.push({ langId: '', snippet });
-            }
-            else {
+                all.push({
+                    langId: "",
+                    snippet
+                });
+            } else {
                 for (const langId of snippet.scopes) {
-                    all.push({ langId, snippet });
+                    all.push({
+                        langId,
+                        snippet
+                    });
                 }
             }
         }
@@ -64,7 +76,7 @@ class ApplyFileSnippetAction extends SnippetsAction {
             for (const item of group) {
                 if (first) {
                     picks.push({
-                        type: 'separator',
+                        type: "separator",
                         label: langService.getLanguageName(item.langId) ?? item.langId
                     });
                     first = false;
@@ -77,8 +89,8 @@ class ApplyFileSnippetAction extends SnippetsAction {
             }
         }
         const pick = await quickInputService.pick(picks, {
-            placeHolder: ( localize(10986, 'Select a snippet')),
-            matchOnDetail: true,
+            placeHolder: ( localize(11305, "Select a snippet")),
+            matchOnDetail: true
         });
         return pick?.snippet;
     }

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.js

@@ -12,22 +12,28 @@ import { Snippet, SnippetSource } from '@codingame/monaco-vscode-api/vscode/vs/w
 
 class Args {
     static fromUser(arg) {
-        if (!arg || typeof arg !== 'object') {
+        if (!arg || typeof arg !== "object") {
             return Args._empty;
         }
-        let { snippet, name, langId } = arg;
-        if (typeof snippet !== 'string') {
+        let {
+            snippet,
+            name,
+            langId
+        } = arg;
+        if (typeof snippet !== "string") {
             snippet = undefined;
         }
-        if (typeof name !== 'string') {
+        if (typeof name !== "string") {
             name = undefined;
         }
-        if (typeof langId !== 'string') {
+        if (typeof langId !== "string") {
             langId = undefined;
         }
         return ( new Args(snippet, name, langId));
     }
-    static { this._empty = ( new Args(undefined, undefined, undefined)); }
+    static {
+        this._empty = ( new Args(undefined, undefined, undefined));
+    }
     constructor(snippet, name, langId) {
         this.snippet = snippet;
         this.name = name;
@@ -37,29 +43,29 @@ class Args {
 class InsertSnippetAction extends SnippetEditorAction {
     constructor() {
         super({
-            id: 'editor.action.insertSnippet',
-            title: ( localize2(10987, "Insert Snippet")),
+            id: "editor.action.insertSnippet",
+            title: ( localize2(11306, "Insert Snippet")),
             f1: true,
             precondition: EditorContextKeys.writable,
             metadata: {
                 description: `Insert Snippet`,
                 args: [{
-                        name: 'args',
-                        schema: {
-                            'type': 'object',
-                            'properties': {
-                                'snippet': {
-                                    'type': 'string'
-                                },
-                                'langId': {
-                                    'type': 'string',
-                                },
-                                'name': {
-                                    'type': 'string'
-                                }
+                    name: "args",
+                    schema: {
+                        "type": "object",
+                        "properties": {
+                            "snippet": {
+                                "type": "string"
+                            },
+                            "langId": {
+                                "type": "string"
                             },
+                            "name": {
+                                "type": "string"
+                            }
                         }
-                    }]
+                    }
+                }]
             }
         });
     }
@@ -72,17 +78,24 @@ class InsertSnippetAction extends SnippetEditorAction {
         const clipboardService = accessor.get(IClipboardService);
         const instaService = accessor.get(IInstantiationService);
         const snippet = await ( new Promise((resolve, reject) => {
-            const { lineNumber, column } = editor.getPosition();
-            const { snippet, name, langId } = Args.fromUser(arg);
+            const {
+                lineNumber,
+                column
+            } = editor.getPosition();
+            const {
+                snippet,
+                name,
+                langId
+            } = Args.fromUser(arg);
             if (snippet) {
                 return resolve(( new Snippet(
                     false,
                     [],
-                    '',
-                    '',
-                    '',
+                    "",
+                    "",
+                    "",
                     snippet,
-                    '',
+                    "",
                     SnippetSource.User,
                     `random/${Math.random()}`
                 )));
@@ -93,8 +106,7 @@ class InsertSnippetAction extends SnippetEditorAction {
                     return resolve(undefined);
                 }
                 languageId = langId;
-            }
-            else {
+            } else {
                 editor.getModel().tokenization.tokenizeIfCheap(lineNumber);
                 languageId = editor.getModel().getLanguageIdAtPosition(lineNumber, column);
                 if (!languageService.getLanguageName(languageId)) {
@@ -102,12 +114,13 @@ class InsertSnippetAction extends SnippetEditorAction {
                 }
             }
             if (name) {
-                snippetService.getSnippets(languageId, { includeNoPrefixSnippets: true })
-                    .then(snippets => snippets.find(snippet => snippet.name === name))
-                    .then(resolve, reject);
-            }
-            else {
-                resolve(instaService.invokeFunction(pickSnippet, languageId));
+                snippetService.getSnippets(languageId, undefined, {
+                    includeNoPrefixSnippets: true
+                }).then(snippets => snippets.find(snippet => snippet.name === name)).then(resolve, reject);
+            } else {
+                resolve(
+                    instaService.invokeFunction(pickSnippet, languageId, editor.getModel().uri)
+                );
             }
         }));
         if (!snippet) {
@@ -118,7 +131,9 @@ class InsertSnippetAction extends SnippetEditorAction {
             clipboardText = await clipboardService.readText();
         }
         editor.focus();
-        SnippetController2.get(editor)?.insert(snippet.codeSnippet, { clipboardText });
+        SnippetController2.get(editor)?.insert(snippet.codeSnippet, {
+            clipboardText
+        });
         snippetService.updateUsageTimestamp(snippet);
     }
 }

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet.js

@@ -10,22 +10,30 @@ import { ISnippetsService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 async function getSurroundableSnippets(snippetsService, model, position, includeDisabledSnippets) {
-    const { lineNumber, column } = position;
+    const {
+        lineNumber,
+        column
+    } = position;
     model.tokenization.tokenizeIfCheap(lineNumber);
     const languageId = model.getLanguageIdAtPosition(lineNumber, column);
-    const allSnippets = await snippetsService.getSnippets(languageId, { includeNoPrefixSnippets: true, includeDisabledSnippets });
+    const allSnippets = await snippetsService.getSnippets(languageId, model.uri, {
+        includeNoPrefixSnippets: true,
+        includeDisabledSnippets
+    });
     return allSnippets.filter(snippet => snippet.usesSelection);
 }
 class SurroundWithSnippetEditorAction extends SnippetEditorAction {
-    static { this.options = {
-        id: 'editor.action.surroundWithSnippet',
-        title: ( localize2(10988, "Surround with Snippet..."))
-    }; }
+    static {
+        this.options = {
+            id: "editor.action.surroundWithSnippet",
+            title: ( localize2(11307, "Surround with Snippet..."))
+        };
+    }
     constructor() {
         super({
             ...SurroundWithSnippetEditorAction.options,
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasNonEmptySelection)),
-            f1: true,
+            f1: true
         });
     }
     async runEditorCommand(accessor, editor) {
@@ -35,11 +43,12 @@ class SurroundWithSnippetEditorAction extends SnippetEditorAction {
         const instaService = accessor.get(IInstantiationService);
         const snippetsService = accessor.get(ISnippetsService);
         const clipboardService = accessor.get(IClipboardService);
-        const snippets = await getSurroundableSnippets(snippetsService, editor.getModel(), editor.getPosition(), true);
+        const model = editor.getModel();
+        const snippets = await getSurroundableSnippets(snippetsService, model, editor.getPosition(), true);
         if (!snippets.length) {
             return;
         }
-        const snippet = await instaService.invokeFunction(pickSnippet, snippets);
+        const snippet = await instaService.invokeFunction(pickSnippet, snippets, model.uri);
         if (!snippet) {
             return;
         }
@@ -48,7 +57,9 @@ class SurroundWithSnippetEditorAction extends SnippetEditorAction {
             clipboardText = await clipboardService.readText();
         }
         editor.focus();
-        SnippetController2.get(editor)?.insert(snippet.codeSnippet, { clipboardText });
+        SnippetController2.get(editor)?.insert(snippet.codeSnippet, {
+            clipboardText
+        });
         snippetsService.updateUsageTimestamp(snippet);
     }
 }

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCodeActionProvider.js

@@ -13,16 +13,22 @@ import { ISnippetsService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 
 var SurroundWithSnippetCodeActionProvider_1, FileTemplateCodeActionProvider_1;
 let SurroundWithSnippetCodeActionProvider = class SurroundWithSnippetCodeActionProvider {
-    static { SurroundWithSnippetCodeActionProvider_1 = this; }
-    static { this._MAX_CODE_ACTIONS = 4; }
-    static { this._overflowCommandCodeAction = {
-        kind: CodeActionKind.SurroundWith.value,
-        title: ( localize(10989, "More...")),
-        command: {
-            id: SurroundWithSnippetEditorAction.options.id,
-            title: SurroundWithSnippetEditorAction.options.title.value,
-        },
-    }; }
+    static {
+        SurroundWithSnippetCodeActionProvider_1 = this;
+    }
+    static {
+        this._MAX_CODE_ACTIONS = 4;
+    }
+    static {
+        this._overflowCommandCodeAction = {
+            kind: CodeActionKind.SurroundWith.value,
+            title: ( localize(11308, "More...")),
+            command: {
+                id: SurroundWithSnippetEditorAction.options.id,
+                title: SurroundWithSnippetEditorAction.options.title.value
+            }
+        };
+    }
     constructor(_snippetService) {
         this._snippetService = _snippetService;
     }
@@ -42,31 +48,35 @@ let SurroundWithSnippetCodeActionProvider = class SurroundWithSnippetCodeActionP
                 break;
             }
             actions.push({
-                title: ( localize(10990, "{0}", snippet.name)),
+                title: ( localize(11309, "{0}", snippet.name)),
                 kind: CodeActionKind.SurroundWith.value,
                 edit: asWorkspaceEdit(model, range, snippet)
             });
         }
         return {
             actions,
-            dispose() { }
+            dispose() {}
         };
     }
 };
-SurroundWithSnippetCodeActionProvider = SurroundWithSnippetCodeActionProvider_1 = ( __decorate([
-    ( __param(0, ISnippetsService))
-], SurroundWithSnippetCodeActionProvider));
+SurroundWithSnippetCodeActionProvider = SurroundWithSnippetCodeActionProvider_1 = ( __decorate([( __param(0, ISnippetsService))], SurroundWithSnippetCodeActionProvider));
 let FileTemplateCodeActionProvider = class FileTemplateCodeActionProvider {
-    static { FileTemplateCodeActionProvider_1 = this; }
-    static { this._MAX_CODE_ACTIONS = 4; }
-    static { this._overflowCommandCodeAction = {
-        title: ( localize(10991, 'Start with Snippet')),
-        kind: CodeActionKind.SurroundWith.value,
-        command: {
-            id: ApplyFileSnippetAction.Id,
-            title: ''
-        }
-    }; }
+    static {
+        FileTemplateCodeActionProvider_1 = this;
+    }
+    static {
+        this._MAX_CODE_ACTIONS = 4;
+    }
+    static {
+        this._overflowCommandCodeAction = {
+            title: ( localize(11310, "Start with Snippet")),
+            kind: CodeActionKind.SurroundWith.value,
+            command: {
+                id: ApplyFileSnippetAction.Id,
+                title: ""
+            }
+        };
+    }
     constructor(_snippetService) {
         this._snippetService = _snippetService;
         this.providedCodeActionKinds = [CodeActionKind.SurroundWith.value];
@@ -75,7 +85,10 @@ let FileTemplateCodeActionProvider = class FileTemplateCodeActionProvider {
         if (model.getValueLength() !== 0) {
             return undefined;
         }
-        const snippets = await this._snippetService.getSnippets(model.getLanguageId(), { fileTemplateSnippets: true, includeNoPrefixSnippets: true });
+        const snippets = await this._snippetService.getSnippets(model.getLanguageId(), model.uri, {
+            fileTemplateSnippets: true,
+            includeNoPrefixSnippets: true
+        });
         const actions = [];
         for (const snippet of snippets) {
             if (actions.length >= FileTemplateCodeActionProvider_1._MAX_CODE_ACTIONS) {
@@ -83,57 +96,58 @@ let FileTemplateCodeActionProvider = class FileTemplateCodeActionProvider {
                 break;
             }
             actions.push({
-                title: ( localize(10992, 'Start with: {0}', snippet.name)),
+                title: ( localize(11311, "Start with: {0}", snippet.name)),
                 kind: CodeActionKind.SurroundWith.value,
                 edit: asWorkspaceEdit(model, model.getFullModelRange(), snippet)
             });
         }
         return {
             actions,
-            dispose() { }
+            dispose() {}
         };
     }
 };
-FileTemplateCodeActionProvider = FileTemplateCodeActionProvider_1 = ( __decorate([
-    ( __param(0, ISnippetsService))
-], FileTemplateCodeActionProvider));
+FileTemplateCodeActionProvider = FileTemplateCodeActionProvider_1 = ( __decorate([( __param(0, ISnippetsService))], FileTemplateCodeActionProvider));
 function asWorkspaceEdit(model, range, snippet) {
     return {
         edits: [{
-                versionId: model.getVersionId(),
-                resource: model.uri,
-                textEdit: {
-                    range,
-                    text: snippet.body,
-                    insertAsSnippet: true,
-                }
-            }]
+            versionId: model.getVersionId(),
+            resource: model.uri,
+            textEdit: {
+                range,
+                text: snippet.body,
+                insertAsSnippet: true
+            }
+        }]
     };
 }
 let SnippetCodeActions = class SnippetCodeActions {
     constructor(instantiationService, languageFeaturesService, configService) {
         this._store = ( new DisposableStore());
-        const setting = 'editor.snippets.codeActions.enabled';
+        const setting = "editor.snippets.codeActions.enabled";
         const sessionStore = ( new DisposableStore());
         const update = () => {
             sessionStore.clear();
             if (configService.getValue(setting)) {
-                sessionStore.add(languageFeaturesService.codeActionProvider.register('*', instantiationService.createInstance(SurroundWithSnippetCodeActionProvider)));
-                sessionStore.add(languageFeaturesService.codeActionProvider.register('*', instantiationService.createInstance(FileTemplateCodeActionProvider)));
+                sessionStore.add(languageFeaturesService.codeActionProvider.register(
+                    "*",
+                    instantiationService.createInstance(SurroundWithSnippetCodeActionProvider)
+                ));
+                sessionStore.add(
+                    languageFeaturesService.codeActionProvider.register("*", instantiationService.createInstance(FileTemplateCodeActionProvider))
+                );
             }
         };
         update();
-        this._store.add(configService.onDidChangeConfiguration(e => e.affectsConfiguration(setting) && update()));
+        this._store.add(
+            configService.onDidChangeConfiguration(e => e.affectsConfiguration(setting) && update())
+        );
         this._store.add(sessionStore);
     }
     dispose() {
         this._store.dispose();
     }
 };
-SnippetCodeActions = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, ILanguageFeaturesService)),
-    ( __param(2, IConfigurationService))
-], SnippetCodeActions));
+SnippetCodeActions = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, ILanguageFeaturesService)), ( __param(2, IConfigurationService))], SnippetCodeActions));
 
 export { SnippetCodeActions };

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetPicker.d.ts

@@ -1,3 +1,4 @@
 import { Snippet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/snippets/browser/snippetsFile";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-export declare function pickSnippet(accessor: ServicesAccessor, languageIdOrSnippets: string | Snippet[]): Promise<Snippet | undefined>;
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+export declare function pickSnippet(accessor: ServicesAccessor, languageIdOrSnippets: string | Snippet[], resourceUri?: URI): Promise<Snippet | undefined>;

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetPicker.js

@@ -8,15 +8,17 @@ import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/th
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 
-async function pickSnippet(accessor, languageIdOrSnippets) {
+async function pickSnippet(accessor, languageIdOrSnippets, resourceUri) {
     const snippetService = accessor.get(ISnippetsService);
     const quickInputService = accessor.get(IQuickInputService);
     let snippets;
     if (Array.isArray(languageIdOrSnippets)) {
         snippets = languageIdOrSnippets;
-    }
-    else {
-        snippets = (await snippetService.getSnippets(languageIdOrSnippets, { includeDisabledSnippets: true, includeNoPrefixSnippets: true }));
+    } else {
+        snippets = (await snippetService.getSnippets(languageIdOrSnippets, resourceUri, {
+            includeDisabledSnippets: true,
+            includeNoPrefixSnippets: true
+        }));
     }
     snippets.sort((a, b) => a.snippetSource - b.snippetSource);
     const makeSnippetPicks = () => {
@@ -29,34 +31,36 @@ async function pickSnippet(accessor, languageIdOrSnippets) {
                 snippet
             };
             if (!prevSnippet || prevSnippet.snippetSource !== snippet.snippetSource || prevSnippet.source !== snippet.source) {
-                let label = '';
+                let label = "";
                 switch (snippet.snippetSource) {
-                    case SnippetSource.User:
-                        label = ( localize(10995, "User Snippets"));
-                        break;
-                    case SnippetSource.Extension:
-                        label = snippet.source;
-                        break;
-                    case SnippetSource.Workspace:
-                        label = ( localize(10996, "Workspace Snippets"));
-                        break;
+                case SnippetSource.User:
+                    label = ( localize(11314, "User Snippets"));
+                    break;
+                case SnippetSource.Extension:
+                    label = snippet.source;
+                    break;
+                case SnippetSource.Workspace:
+                    label = ( localize(11315, "Workspace Snippets"));
+                    break;
                 }
-                result.push({ type: 'separator', label });
+                result.push({
+                    type: "separator",
+                    label
+                });
             }
             if (snippet.snippetSource === SnippetSource.Extension) {
                 const isEnabled = snippetService.isEnabled(snippet);
                 if (isEnabled) {
                     pick.buttons = [{
-                            iconClass: ThemeIcon.asClassName(Codicon.eyeClosed),
-                            tooltip: ( localize(10997, 'Hide from IntelliSense'))
-                        }];
-                }
-                else {
-                    pick.description = ( localize(10998, "(hidden from IntelliSense)"));
+                        iconClass: ThemeIcon.asClassName(Codicon.eyeClosed),
+                        tooltip: ( localize(11316, "Hide from IntelliSense"))
+                    }];
+                } else {
+                    pick.description = ( localize(11317, "(hidden from IntelliSense)"));
                     pick.buttons = [{
-                            iconClass: ThemeIcon.asClassName(Codicon.eye),
-                            tooltip: ( localize(10999, 'Show in IntelliSense'))
-                        }];
+                        iconClass: ThemeIcon.asClassName(Codicon.eye),
+                        tooltip: ( localize(11318, "Show in IntelliSense"))
+                    }];
                 }
             }
             result.push(pick);
@@ -65,8 +69,10 @@ async function pickSnippet(accessor, languageIdOrSnippets) {
         return result;
     };
     const disposables = ( new DisposableStore());
-    const picker = disposables.add(quickInputService.createQuickPick({ useSeparators: true }));
-    picker.placeholder = ( localize(11000, "Select a snippet"));
+    const picker = disposables.add(quickInputService.createQuickPick({
+        useSeparators: true
+    }));
+    picker.placeholder = ( localize(11319, "Select a snippet"));
     picker.matchOnDetail = true;
     picker.ignoreFocusOut = false;
     picker.keepScrollPosition = true;
@@ -77,7 +83,7 @@ async function pickSnippet(accessor, languageIdOrSnippets) {
     }));
     picker.items = makeSnippetPicks();
     if (!picker.items.length) {
-        picker.validationMessage = ( localize(11001, "No snippet available"));
+        picker.validationMessage = ( localize(11320, "No snippet available"));
     }
     picker.show();
     await Promise.race([Event.toPromise(picker.onDidAccept), Event.toPromise(picker.onDidHide)]);

package/vscode/src/vs/workbench/contrib/snippets/browser/snippets.contribution.js

@@ -19,50 +19,68 @@ import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/snippets/browse
 import { editorConfigurationBaseNode } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorConfigurationSchema';
 
 registerAction2(InsertSnippetAction);
-CommandsRegistry.registerCommandAlias('editor.action.showSnippets', 'editor.action.insertSnippet');
+CommandsRegistry.registerCommandAlias("editor.action.showSnippets", "editor.action.insertSnippet");
 registerAction2(SurroundWithSnippetEditorAction);
 registerAction2(ApplyFileSnippetAction);
 registerAction2(ConfigureSnippetsAction);
 const workbenchContribRegistry = ( Registry.as(Extensions.Workbench));
 workbenchContribRegistry.registerWorkbenchContribution(SnippetCodeActions, LifecyclePhase.Restored);
-( Registry
-    .as(Extensions$1.Configuration))
-    .registerConfiguration({
+( Registry.as(Extensions$1.Configuration)).registerConfiguration({
     ...editorConfigurationBaseNode,
-    'properties': {
-        'editor.snippets.codeActions.enabled': {
-            'description': ( localize(
-                11002,
-                'Controls if surround-with-snippets or file template snippets show as Code Actions.'
+    "properties": {
+        "editor.snippets.codeActions.enabled": {
+            "description": ( localize(
+                11321,
+                "Controls if surround-with-snippets or file template snippets show as Code Actions."
             )),
-            'type': 'boolean',
-            'default': true
+            "type": "boolean",
+            "default": true
         }
     }
 });
-const languageScopeSchemaId = 'vscode://schemas/snippets';
+const languageScopeSchemaId = "vscode://schemas/snippets";
 const snippetSchemaProperties = {
     prefix: {
-        description: ( localize(11003, 'The prefix to use when selecting the snippet in intellisense')),
-        type: ['string', 'array']
+        description: ( localize(11322, "The prefix to use when selecting the snippet in intellisense")),
+        type: ["string", "array"]
     },
     isFileTemplate: {
-        description: ( localize(11004, 'The snippet is meant to populate or replace a whole file')),
-        type: 'boolean'
+        description: ( localize(11323, "The snippet is meant to populate or replace a whole file")),
+        type: "boolean"
     },
     body: {
         markdownDescription: ( localize(
-            11005,
-            'The snippet content. Use `$1`, `${1:defaultText}` to define cursor positions, use `$0` for the final cursor position. Insert variable values with `${varName}` and `${varName:defaultText}`, e.g. `This is file: $TM_FILENAME`.'
+            11324,
+            "The snippet content. Use `$1`, `${1:defaultText}` to define cursor positions, use `$0` for the final cursor position. Insert variable values with `${varName}` and `${varName:defaultText}`, e.g. `This is file: $TM_FILENAME`."
         )),
-        type: ['string', 'array'],
+        type: ["string", "array"],
         items: {
-            type: 'string'
+            type: "string"
         }
     },
     description: {
-        description: ( localize(11006, 'The snippet description.')),
-        type: ['string', 'array']
+        description: ( localize(11325, "The snippet description.")),
+        type: ["string", "array"]
+    },
+    include: {
+        markdownDescription: ( localize(
+            11326,
+            "A list of [glob patterns](https://aka.ms/vscode-glob-patterns) to include the snippet for specific files, e.g. `[\"**/*.test.ts\", \"*.spec.ts\"]` or `\"**/*.spec.ts\"`. Patterns will match on the absolute path of a file if they contain a path separator and will match on the name of the file otherwise. You can exclude matching files via the `exclude` property."
+        )),
+        type: ["string", "array"],
+        items: {
+            type: "string"
+        }
+    },
+    exclude: {
+        markdownDescription: ( localize(
+            11327,
+            "A list of [glob patterns](https://aka.ms/vscode-glob-patterns) to exclude the snippet from specific files, e.g. `[\"**/*.min.js\"]` or `\"*.min.js\"`. Patterns will match on the absolute path of a file if they contain a path separator and will match on the name of the file otherwise. Exclude patterns take precedence over `include` patterns."
+        )),
+        type: ["string", "array"],
+        items: {
+            type: "string"
+        }
     }
 };
 const languageScopeSchema = {
@@ -70,40 +88,53 @@ const languageScopeSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-            label: ( localize(11007, "Empty snippet")),
-            body: { '${1:snippetName}': { 'prefix': '${2:prefix}', 'body': '${3:snippet}', 'description': '${4:description}' } }
-        }],
-    type: 'object',
-    description: ( localize(11008, 'User snippet configuration')),
+        label: ( localize(11328, "Empty snippet")),
+        body: {
+            "${1:snippetName}": {
+                "prefix": "${2:prefix}",
+                "body": "${3:snippet}",
+                "description": "${4:description}"
+            }
+        }
+    }],
+    type: "object",
+    description: ( localize(11329, "User snippet configuration")),
     additionalProperties: {
-        type: 'object',
-        required: ['body'],
+        type: "object",
+        required: ["body"],
         properties: snippetSchemaProperties,
         additionalProperties: false
     }
 };
-const globalSchemaId = 'vscode://schemas/global-snippets';
+const globalSchemaId = "vscode://schemas/global-snippets";
 const globalSchema = {
     id: globalSchemaId,
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-            label: ( localize(11007, "Empty snippet")),
-            body: { '${1:snippetName}': { 'scope': '${2:scope}', 'prefix': '${3:prefix}', 'body': '${4:snippet}', 'description': '${5:description}' } }
-        }],
-    type: 'object',
-    description: ( localize(11008, 'User snippet configuration')),
+        label: ( localize(11328, "Empty snippet")),
+        body: {
+            "${1:snippetName}": {
+                "scope": "${2:scope}",
+                "prefix": "${3:prefix}",
+                "body": "${4:snippet}",
+                "description": "${5:description}"
+            }
+        }
+    }],
+    type: "object",
+    description: ( localize(11329, "User snippet configuration")),
     additionalProperties: {
-        type: 'object',
-        required: ['body'],
+        type: "object",
+        required: ["body"],
         properties: {
             ...snippetSchemaProperties,
             scope: {
                 description: ( localize(
-                    11009,
+                    11330,
                     "A list of language names to which this snippet applies, e.g. 'typescript,javascript'."
                 )),
-                type: 'string'
+                type: "string"
             }
         },
         additionalProperties: false