@codingame/monaco-vscode-api 1.67.0 → 1.67.3

package/dist/api.amd.js

@@ -4771,16 +4771,8 @@ define(['exports', 'monaco-editor/esm/vs/base/common/errors.js', 'monaco-editor/
         workspaceFile: undefined,
         createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents) {
             const services$1 = services.Services.get();
-            if (typeof globPattern !== 'string') {
-                throw new Error('unsupported');
-            }
             if (services$1.workspace?.createFileSystemWatcher != null) {
-                const watcher = services$1.workspace.createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents);
-                return Object.assign(watcher, {
-                    ignoreCreateEvents: ignoreCreateEvents ?? false,
-                    ignoreChangeEvents: ignoreChangeEvents ?? false,
-                    ignoreDeleteEvents: ignoreDeleteEvents ?? false
-                });
+                return services$1.workspace.createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents);
             }
             return {
                 ignoreCreateEvents: ignoreCreateEvents ?? false,
@@ -4798,31 +4790,26 @@ define(['exports', 'monaco-editor/esm/vs/base/common/errors.js', 'monaco-editor/
             await standaloneServices_js.StandaloneServices.get(bulkEditService_js.IBulkEditService).apply(resourceEdits);
             return true;
         },
-        getConfiguration(section, resource) {
+        get getConfiguration() {
             const { workspace } = services.Services.get();
-            const configuration = (workspace?.configurations != null)
-                ? workspace.configurations.getConfiguration(section, (resource != null) ? resource.toString() : undefined)
-                : undefined;
-            const result = {
+            return workspace?.getConfiguration ?? (() => ({
                 get: (section, defaultValue) => {
-                    return (configuration != null) ? configuration.get(section, defaultValue) : defaultValue;
+                    return defaultValue;
                 },
-                has: (section) => {
-                    return (configuration != null) ? configuration.has(section) : false;
+                has: () => {
+                    return false;
                 },
                 inspect: unsupported$1,
                 update: unsupported$1
-            };
-            return Object.assign(result, {
-                toJSON: () => (configuration != null) ? configuration.toJSON() : undefined
-            });
+            }));
         },
         get onDidChangeConfiguration() {
             const services$1 = services.Services.get();
-            if (services$1.workspace?.configurations != null) {
-                return services$1.workspace.configurations.onDidChangeConfiguration;
-            }
-            return event_js.Event.None;
+            return services$1.workspace?.onDidChangeConfiguration ?? event_js.Event.None;
+        },
+        get rootPath() {
+            const services$1 = services.Services.get();
+            return services$1.workspace?.rootPath;
         },
         get workspaceFolders() {
             const services$1 = services.Services.get();
@@ -4832,17 +4819,22 @@ define(['exports', 'monaco-editor/esm/vs/base/common/errors.js', 'monaco-editor/
             if ('workspaceFolders' in services$1.workspace) {
                 return services$1.workspace.workspaceFolders;
             }
-            const rootUri = services$1.workspace.rootUri;
-            if (rootUri == null) {
+            const rootPath = services$1.workspace.rootPath;
+            if (rootPath == null) {
                 return undefined;
             }
-            const uri = monaco__namespace.Uri.parse(rootUri);
+            const uri = uri_js.URI.file(rootPath);
             return [{
                     uri,
                     index: 0,
                     name: uri.toString()
                 }];
         },
+        getWorkspaceFolder(uri) {
+            return this.workspaceFolders?.find(folder => {
+                return uri.path.startsWith(folder.uri.path);
+            });
+        },
         get onDidChangeWorkspaceFolders() {
             const services$1 = services.Services.get();
             return services$1.workspace?.onDidChangeWorkspaceFolders ?? event_js.Event.None;
@@ -4888,7 +4880,6 @@ define(['exports', 'monaco-editor/esm/vs/base/common/errors.js', 'monaco-editor/
         get onDidGrantWorkspaceTrust() {
             return event_js.Event.None;
         },
-        getWorkspaceFolder: unsupported$1,
         asRelativePath: unsupported$1,
         updateWorkspaceFolders: unsupported$1,
         findFiles: unsupported$1,
@@ -4903,7 +4894,6 @@ define(['exports', 'monaco-editor/esm/vs/base/common/errors.js', 'monaco-editor/
         onDidOpenNotebookDocument: unsupported$1,
         onDidCloseNotebookDocument: unsupported$1,
         isTrusted: true,
-        rootPath: undefined,
         name: undefined,
         onDidChangeNotebookDocument: unsupported$1,
         onDidSaveNotebookDocument: unsupported$1

package/dist/api.cjs

@@ -4814,16 +4814,8 @@ const workspace$2 = {
     workspaceFile: undefined,
     createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents) {
         const services$1 = services.Services.get();
-        if (typeof globPattern !== 'string') {
-            throw new Error('unsupported');
-        }
         if (services$1.workspace?.createFileSystemWatcher != null) {
-            const watcher = services$1.workspace.createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents);
-            return Object.assign(watcher, {
-                ignoreCreateEvents: ignoreCreateEvents ?? false,
-                ignoreChangeEvents: ignoreChangeEvents ?? false,
-                ignoreDeleteEvents: ignoreDeleteEvents ?? false
-            });
+            return services$1.workspace.createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents);
         }
         return {
             ignoreCreateEvents: ignoreCreateEvents ?? false,
@@ -4841,31 +4833,26 @@ const workspace$2 = {
         await standaloneServices_js.StandaloneServices.get(bulkEditService_js.IBulkEditService).apply(resourceEdits);
         return true;
     },
-    getConfiguration(section, resource) {
+    get getConfiguration() {
         const { workspace } = services.Services.get();
-        const configuration = (workspace?.configurations != null)
-            ? workspace.configurations.getConfiguration(section, (resource != null) ? resource.toString() : undefined)
-            : undefined;
-        const result = {
+        return workspace?.getConfiguration ?? (() => ({
             get: (section, defaultValue) => {
-                return (configuration != null) ? configuration.get(section, defaultValue) : defaultValue;
+                return defaultValue;
             },
-            has: (section) => {
-                return (configuration != null) ? configuration.has(section) : false;
+            has: () => {
+                return false;
             },
             inspect: unsupported$1,
             update: unsupported$1
-        };
-        return Object.assign(result, {
-            toJSON: () => (configuration != null) ? configuration.toJSON() : undefined
-        });
+        }));
     },
     get onDidChangeConfiguration() {
         const services$1 = services.Services.get();
-        if (services$1.workspace?.configurations != null) {
-            return services$1.workspace.configurations.onDidChangeConfiguration;
-        }
-        return event_js.Event.None;
+        return services$1.workspace?.onDidChangeConfiguration ?? event_js.Event.None;
+    },
+    get rootPath() {
+        const services$1 = services.Services.get();
+        return services$1.workspace?.rootPath;
     },
     get workspaceFolders() {
         const services$1 = services.Services.get();
@@ -4875,17 +4862,22 @@ const workspace$2 = {
         if ('workspaceFolders' in services$1.workspace) {
             return services$1.workspace.workspaceFolders;
         }
-        const rootUri = services$1.workspace.rootUri;
-        if (rootUri == null) {
+        const rootPath = services$1.workspace.rootPath;
+        if (rootPath == null) {
             return undefined;
         }
-        const uri = monaco__namespace.Uri.parse(rootUri);
+        const uri = uri_js.URI.file(rootPath);
         return [{
                 uri,
                 index: 0,
                 name: uri.toString()
             }];
     },
+    getWorkspaceFolder(uri) {
+        return this.workspaceFolders?.find(folder => {
+            return uri.path.startsWith(folder.uri.path);
+        });
+    },
     get onDidChangeWorkspaceFolders() {
         const services$1 = services.Services.get();
         return services$1.workspace?.onDidChangeWorkspaceFolders ?? event_js.Event.None;
@@ -4931,7 +4923,6 @@ const workspace$2 = {
     get onDidGrantWorkspaceTrust() {
         return event_js.Event.None;
     },
-    getWorkspaceFolder: unsupported$1,
     asRelativePath: unsupported$1,
     updateWorkspaceFolders: unsupported$1,
     findFiles: unsupported$1,
@@ -4946,7 +4937,6 @@ const workspace$2 = {
     onDidOpenNotebookDocument: unsupported$1,
     onDidCloseNotebookDocument: unsupported$1,
     isTrusted: true,
-    rootPath: undefined,
     name: undefined,
     onDidChangeNotebookDocument: unsupported$1,
     onDidSaveNotebookDocument: unsupported$1

package/dist/api.js

@@ -4787,16 +4787,8 @@ const workspace$2 = {
     workspaceFile: undefined,
     createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents) {
         const services = Services.get();
-        if (typeof globPattern !== 'string') {
-            throw new Error('unsupported');
-        }
         if (services.workspace?.createFileSystemWatcher != null) {
-            const watcher = services.workspace.createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents);
-            return Object.assign(watcher, {
-                ignoreCreateEvents: ignoreCreateEvents ?? false,
-                ignoreChangeEvents: ignoreChangeEvents ?? false,
-                ignoreDeleteEvents: ignoreDeleteEvents ?? false
-            });
+            return services.workspace.createFileSystemWatcher(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents);
         }
         return {
             ignoreCreateEvents: ignoreCreateEvents ?? false,
@@ -4814,31 +4806,26 @@ const workspace$2 = {
         await StandaloneServices.get(IBulkEditService).apply(resourceEdits);
         return true;
     },
-    getConfiguration(section, resource) {
+    get getConfiguration() {
         const { workspace } = Services.get();
-        const configuration = (workspace?.configurations != null)
-            ? workspace.configurations.getConfiguration(section, (resource != null) ? resource.toString() : undefined)
-            : undefined;
-        const result = {
+        return workspace?.getConfiguration ?? (() => ({
             get: (section, defaultValue) => {
-                return (configuration != null) ? configuration.get(section, defaultValue) : defaultValue;
+                return defaultValue;
             },
-            has: (section) => {
-                return (configuration != null) ? configuration.has(section) : false;
+            has: () => {
+                return false;
             },
             inspect: unsupported$1,
             update: unsupported$1
-        };
-        return Object.assign(result, {
-            toJSON: () => (configuration != null) ? configuration.toJSON() : undefined
-        });
+        }));
     },
     get onDidChangeConfiguration() {
         const services = Services.get();
-        if (services.workspace?.configurations != null) {
-            return services.workspace.configurations.onDidChangeConfiguration;
-        }
-        return Event.None;
+        return services.workspace?.onDidChangeConfiguration ?? Event.None;
+    },
+    get rootPath() {
+        const services = Services.get();
+        return services.workspace?.rootPath;
     },
     get workspaceFolders() {
         const services = Services.get();
@@ -4848,17 +4835,22 @@ const workspace$2 = {
         if ('workspaceFolders' in services.workspace) {
             return services.workspace.workspaceFolders;
         }
-        const rootUri = services.workspace.rootUri;
-        if (rootUri == null) {
+        const rootPath = services.workspace.rootPath;
+        if (rootPath == null) {
             return undefined;
         }
-        const uri = monaco.Uri.parse(rootUri);
+        const uri = URI.file(rootPath);
         return [{
                 uri,
                 index: 0,
                 name: uri.toString()
             }];
     },
+    getWorkspaceFolder(uri) {
+        return this.workspaceFolders?.find(folder => {
+            return uri.path.startsWith(folder.uri.path);
+        });
+    },
     get onDidChangeWorkspaceFolders() {
         const services = Services.get();
         return services.workspace?.onDidChangeWorkspaceFolders ?? Event.None;
@@ -4904,7 +4896,6 @@ const workspace$2 = {
     get onDidGrantWorkspaceTrust() {
         return Event.None;
     },
-    getWorkspaceFolder: unsupported$1,
     asRelativePath: unsupported$1,
     updateWorkspaceFolders: unsupported$1,
     findFiles: unsupported$1,
@@ -4919,7 +4910,6 @@ const workspace$2 = {
     onDidOpenNotebookDocument: unsupported$1,
     onDidCloseNotebookDocument: unsupported$1,
     isTrusted: true,
-    rootPath: undefined,
     name: undefined,
     onDidChangeNotebookDocument: unsupported$1,
     onDidSaveNotebookDocument: unsupported$1

package/dist/services.d.ts

@@ -3202,19 +3202,15 @@ interface Window {
     withProgress?: typeof vscode.window.withProgress;
     showTextDocument?(document: vscode.Uri, options?: vscode.TextDocumentShowOptions): PromiseLike<void>;
 }
-interface Configurations {
-    getConfiguration(section?: string, resource?: string): vscode.WorkspaceConfiguration;
-    readonly onDidChangeConfiguration: vscode.Event<vscode.ConfigurationChangeEvent>;
-}
 interface Workspace {
-    readonly rootPath?: string | null;
-    readonly rootUri: string | null;
-    readonly workspaceFolders?: typeof vscode.workspace.workspaceFolders;
-    readonly onDidChangeWorkspaceFolders?: typeof vscode.workspace.onDidChangeWorkspaceFolders;
-    readonly configurations?: Configurations;
-    readonly onWillSaveTextDocument?: vscode.Event<vscode.TextDocumentWillSaveEvent>;
-    readonly onDidSaveTextDocument?: vscode.Event<vscode.TextDocument>;
-    createFileSystemWatcher?(globPattern: string, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): vscode.FileSystemWatcher;
+    rootPath?: string;
+    workspaceFolders?: typeof vscode.workspace.workspaceFolders;
+    onDidChangeWorkspaceFolders?: typeof vscode.workspace.onDidChangeWorkspaceFolders;
+    getConfiguration?: typeof vscode.workspace.getConfiguration;
+    onDidChangeConfiguration?: vscode.Event<vscode.ConfigurationChangeEvent>;
+    onWillSaveTextDocument?: vscode.Event<vscode.TextDocumentWillSaveEvent>;
+    onDidSaveTextDocument?: vscode.Event<vscode.TextDocument>;
+    createFileSystemWatcher?: typeof vscode.workspace.createFileSystemWatcher;
 }
 interface Env {
     openExternal?(document: vscode.Uri): PromiseLike<boolean>;
@@ -3231,4 +3227,4 @@ declare namespace Services {
     function install(_services: Services): vscode.Disposable;
 }
 
-export { CallHierarchyProvider, Configurations, Env, EvaluatableExpressionProvider, IWorkspaceSymbolProvider, Languages, Services, Severity, TypeHierarchyProvider, Window, Workspace };
+export { CallHierarchyProvider, Env, EvaluatableExpressionProvider, IWorkspaceSymbolProvider, Languages, Services, Severity, TypeHierarchyProvider, Window, Workspace };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.67.0",
+  "version": "1.67.3",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],