@codingame/monaco-vscode-notebook-service-override 1.85.6 → 2.0.0-v2.1

package/vscode/src/vs/workbench/contrib/notebook/common/notebookProvider.js

@@ -1,5 +1,5 @@
-import * as glob from 'monaco-editor/esm/vs/base/common/glob.js';
-import { basename } from 'monaco-editor/esm/vs/base/common/path.js';
+import { match, isRelativePattern } from 'vscode/vscode/vs/base/common/glob';
+import { basename } from 'vscode/vscode/vs/base/common/path';
 import { isDocumentExcludePattern } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
 class NotebookProviderInfo {
@@ -40,12 +40,12 @@ class NotebookProviderInfo {
     }
     static selectorMatches(selector, resource) {
         if (typeof selector === 'string') {
-            if (glob.match(selector.toLowerCase(), basename(resource.fsPath).toLowerCase())) {
+            if (match(selector.toLowerCase(), basename(resource.fsPath).toLowerCase())) {
                 return true;
             }
         }
-        if (glob.isRelativePattern(selector)) {
-            if (glob.match(selector, basename(resource.fsPath).toLowerCase())) {
+        if (isRelativePattern(selector)) {
+            if (match(selector, basename(resource.fsPath).toLowerCase())) {
                 return true;
             }
         }
@@ -54,9 +54,9 @@ class NotebookProviderInfo {
         }
         const filenamePattern = selector.include;
         const excludeFilenamePattern = selector.exclude;
-        if (glob.match(filenamePattern, basename(resource.fsPath).toLowerCase())) {
+        if (match(filenamePattern, basename(resource.fsPath).toLowerCase())) {
             if (excludeFilenamePattern) {
-                if (glob.match(excludeFilenamePattern, basename(resource.fsPath).toLowerCase())) {
+                if (match(excludeFilenamePattern, basename(resource.fsPath).toLowerCase())) {
                     return false;
                 }
             }
@@ -79,7 +79,7 @@ class NotebookProviderInfo {
         if (typeof selector === 'string') {
             candidate = selector;
         }
-        else if (glob.isRelativePattern(selector)) {
+        else if (isRelativePattern(selector)) {
             candidate = selector.pattern;
         }
         else if (selector.include) {

package/vscode/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.js

@@ -1,10 +1,10 @@
-import { LcsDiff } from 'monaco-editor/esm/vs/base/common/diff/diff.js';
-import { hash, numberHash, doHash } from 'monaco-editor/esm/vs/base/common/hash.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { PieceTreeTextBufferBuilder } from 'monaco-editor/esm/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
+import { LcsDiff } from 'vscode/vscode/vs/base/common/diff/diff';
+import { hash, numberHash, doHash } from 'vscode/vscode/vs/base/common/hash';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { PieceTreeTextBufferBuilder } from 'vscode/vscode/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 import { CellKind, NotebookCellsChangeType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { SearchParams } from 'monaco-editor/esm/vs/editor/common/model/textModelSearch.js';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { SearchParams } from 'vscode/vscode/vs/editor/common/model/textModelSearch';
 
 function bufferHash(buffer) {
     let initialHashVal = numberHash(104579, 0);

package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.js

@@ -1,13 +1,13 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { ResourceSet, ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { ResourceSet, ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from 'vscode/vscode/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers';
-import * as arrays from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { isNumber } from 'monaco-editor/esm/vs/base/common/types.js';
+import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
+import { isNumber } from 'vscode/vscode/vs/base/common/types';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { INotebookEditorService } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService';
 
@@ -53,7 +53,7 @@ let NotebookSearchService = class NotebookSearchService {
                     const closedNotebookResult = resolvedPromise[1];
                     const resolved = resolvedPromise.filter((e) => !!e);
                     const resultArray = [...( openNotebookResult.results.values()), ...(closedNotebookResult?.results.values() ?? [])];
-                    const results = arrays.coalesce(resultArray);
+                    const results = coalesce(resultArray);
                     if (onProgress) {
                         results.forEach(onProgress);
                     }
@@ -67,7 +67,7 @@ let NotebookSearchService = class NotebookSearchService {
                 allScannedFiles: promise.then(resolvedPromise => {
                     const openNotebookResults = resolvedPromise[0];
                     const closedNotebookResults = resolvedPromise[1];
-                    const results = arrays.coalesce([...( openNotebookResults.results.keys()), ...(closedNotebookResults?.results.keys() ?? [])]);
+                    const results = coalesce([...( openNotebookResults.results.keys()), ...(closedNotebookResults?.results.keys() ?? [])]);
                     return ( new ResourceSet(results, uri => this.uriIdentityService.extUri.getComparisonKey(uri)));
                 })
             };

package/vscode/src/vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager.js

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
-import { Promises } from 'monaco-editor/esm/vs/base/common/async.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { Promises } from 'vscode/vscode/vs/base/common/async';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
 
 let BaseFileWorkingCopyManager = class BaseFileWorkingCopyManager extends Disposable {

package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.js

@@ -1,24 +1,24 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Promises } from 'monaco-editor/esm/vs/base/common/async.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { isEqual, toLocalResource, basename, dirname, joinPath } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Promises } from 'vscode/vscode/vs/base/common/async';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { isEqual, toLocalResource, basename, dirname, joinPath } from 'vscode/vscode/vs/base/common/resources';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { SaveSourceRegistry } from 'vscode/vscode/vs/workbench/common/editor';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { StoredFileWorkingCopyManager } from './storedFileWorkingCopyManager.js';
 import { UntitledFileWorkingCopy } from './untitledFileWorkingCopy.js';
 import { UntitledFileWorkingCopyManager } from './untitledFileWorkingCopyManager.js';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IElevatedFileService } from 'vscode/vscode/vs/workbench/services/files/common/elevatedFileService';
 import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
@@ -26,10 +26,10 @@ import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
 import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IDecorationsService } from 'vscode/vscode/vs/workbench/services/decorations/common/decorations';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { listErrorForeground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { listErrorForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
 import { IFileDialogService, IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 var FileWorkingCopyManager_1;

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.js

@@ -1,29 +1,29 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { DisposableStore, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { StoredFileWorkingCopy } from 'vscode/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
-import { ResourceQueue, Promises } from 'monaco-editor/esm/vs/base/common/async.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { ResourceQueue, Promises } from 'vscode/vscode/vs/base/common/async';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { joinPath } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
 import { BaseFileWorkingCopyManager } from './abstractFileWorkingCopyManager.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IElevatedFileService } from 'vscode/vscode/vs/workbench/services/files/common/elevatedFileService';
 import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-import { isWeb } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
+import { isWeb } from 'vscode/vscode/vs/base/common/platform';
+import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 
 let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends BaseFileWorkingCopyManager {
     constructor(workingCopyTypeId, modelFactory, fileService, lifecycleService, labelService, logService, workingCopyFileService, workingCopyBackupService, uriIdentityService, filesConfigurationService, workingCopyService, notificationService, workingCopyEditorService, editorService, elevatedFileService) {

package/vscode/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { raceCancellation } from 'monaco-editor/esm/vs/base/common/async.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { raceCancellation } from 'vscode/vscode/vs/base/common/async';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { emptyStream } from 'monaco-editor/esm/vs/base/common/stream.js';
+import { emptyStream } from 'vscode/vscode/vs/base/common/stream';
 
 let UntitledFileWorkingCopy = class UntitledFileWorkingCopy extends Disposable {
     get model() { return this._model; }

package/vscode/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopyManager.js

@@ -1,16 +1,16 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { DisposableStore, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { UntitledFileWorkingCopy } from './untitledFileWorkingCopy.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { BaseFileWorkingCopyManager } from './abstractFileWorkingCopyManager.js';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 
 let UntitledFileWorkingCopyManager = class UntitledFileWorkingCopyManager extends BaseFileWorkingCopyManager {
     constructor(workingCopyTypeId, modelFactory, saveDelegate, fileService, labelService, logService, workingCopyBackupService, workingCopyService) {

package/workers/notebook.worker.js

@@ -1,5 +1,5 @@
 import { create } from '../vscode/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.js';
-import { SimpleWorkerServer } from 'monaco-editor/esm/vs/base/common/worker/simpleWorker.js';
+import { SimpleWorkerServer } from 'vscode/vscode/vs/base/common/worker/simpleWorker';
 
 const simpleWorker = new SimpleWorkerServer((msg) => {
     globalThis.postMessage(msg);