@codingame/monaco-vscode-notebook-service-override 2.2.2 → 3.1.0

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.js

@@ -2,7 +2,6 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { toAction } from 'vscode/vscode/vs/base/common/actions';
 import { createErrorWithActions } from 'vscode/vscode/vs/base/common/errorMessage';
-import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { Lazy } from 'vscode/vscode/vs/base/common/lazy';
@@ -12,8 +11,6 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
-import { BareFontInfo } from 'vscode/vscode/vs/editor/common/config/fontInfo';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
@@ -26,7 +23,6 @@ import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
 import { NotebookEditorPriority, NotebookSetting, RENDERER_NOT_AVAILABLE, RENDERER_EQUIVALENT_EXTENSIONS, MimeTypeDisplayOrder, ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_DISPLAY_ORDER, CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
-import { updateEditorTopPadding } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookOptions';
 import { NotebookOutputRendererInfo, NotebookStaticPreloadInfo } from '../../common/notebookOutputRenderer.js';
 import { NotebookProviderInfo } from '../../common/notebookProvider.js';
 import { SimpleNotebookProviderInfo } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
@@ -352,14 +348,12 @@ let NotebookService = class NotebookService extends Disposable {
         }
         return this._notebookProviderInfoStore;
     }
-    constructor(_extensionService, _configurationService, _accessibilityService, _instantiationService, _codeEditorService, configurationService, _storageService, _notebookDocumentService) {
+    constructor(_extensionService, _configurationService, _accessibilityService, _instantiationService, _storageService, _notebookDocumentService) {
         super();
         this._extensionService = _extensionService;
         this._configurationService = _configurationService;
         this._accessibilityService = _accessibilityService;
         this._instantiationService = _instantiationService;
-        this._codeEditorService = _codeEditorService;
-        this.configurationService = configurationService;
         this._storageService = _storageService;
         this._notebookDocumentService = _notebookDocumentService;
         this._notebookProviders = ( new Map());
@@ -453,34 +447,6 @@ let NotebookService = class NotebookService extends Disposable {
         this._register(this._accessibilityService.onDidChangeScreenReaderOptimized(() => {
             updateOrder();
         }));
-        let decorationTriggeredAdjustment = false;
-        const decorationCheckSet = ( new Set());
-        const onDidAddDecorationType = (e) => {
-            if (decorationTriggeredAdjustment) {
-                return;
-            }
-            if (( decorationCheckSet.has(e))) {
-                return;
-            }
-            const options = this._codeEditorService.resolveDecorationOptions(e, true);
-            if (options.afterContentClassName || options.beforeContentClassName) {
-                const cssRules = this._codeEditorService.resolveDecorationCSSRules(e);
-                if (cssRules !== null) {
-                    for (let i = 0; i < cssRules.length; i++) {
-                        if ((cssRules[i].selectorText.endsWith('::after') || cssRules[i].selectorText.endsWith('::after'))
-                            && cssRules[i].cssText.indexOf('top:') > -1) {
-                            const editorOptions = this.configurationService.getValue('editor');
-                            updateEditorTopPadding(BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.value).lineHeight + 2);
-                            decorationTriggeredAdjustment = true;
-                            break;
-                        }
-                    }
-                }
-            }
-            decorationCheckSet.add(e);
-        };
-        this._register(this._codeEditorService.onDecorationTypeRegistered(onDidAddDecorationType));
-        this._codeEditorService.listDecorationTypes().forEach(onDidAddDecorationType);
         this._memento = ( new Memento(NotebookService_1._storageNotebookViewTypeProvider, this._storageService));
         this._viewTypeCache = this._memento.getMemento(1 , 1 );
     }
@@ -668,10 +634,8 @@ NotebookService = NotebookService_1 = ( __decorate([
     ( __param(1, IConfigurationService)),
     ( __param(2, IAccessibilityService)),
     ( __param(3, IInstantiationService)),
-    ( __param(4, ICodeEditorService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IStorageService)),
-    ( __param(7, INotebookDocumentService))
+    ( __param(4, IStorageService)),
+    ( __param(5, INotebookDocumentService))
 ], NotebookService));
 
 export { NotebookOutputRendererInfoStore, NotebookProviderInfoStore, NotebookService };

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

@@ -6,20 +6,24 @@ 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 { pathIncludedInQuery } from 'vscode/vscode/vs/workbench/services/search/common/search';
+import { pathIncludedInQuery, ISearchService } from 'vscode/vscode/vs/workbench/services/search/common/search';
 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';
+import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
 let NotebookSearchService = class NotebookSearchService {
-    constructor(uriIdentityService, notebookEditorService, logService, notebookService, configurationService, editorResolverService) {
+    constructor(uriIdentityService, notebookEditorService, logService, notebookService, configurationService, editorResolverService, searchService, instantiationService) {
         this.uriIdentityService = uriIdentityService;
         this.notebookEditorService = notebookEditorService;
         this.logService = logService;
         this.notebookService = notebookService;
         this.configurationService = configurationService;
         this.editorResolverService = editorResolverService;
+        this.searchService = searchService;
+        this.queryBuilder = instantiationService.createInstance(QueryBuilder);
     }
     notebookSearch(query, token, searchInstanceID, onProgress) {
         if (query.type !== 2 ) {
@@ -80,6 +84,20 @@ let NotebookSearchService = class NotebookSearchService {
             allScannedFiles: promiseResults.allScannedFiles
         };
     }
+    async doesFileExist(includes, folderQueries, token) {
+        const promises = ( includes.map(async (includePattern) => {
+            const query = this.queryBuilder.file(( folderQueries.map(e => e.folder)), {
+                includePattern: includePattern.startsWith('/') ? includePattern : '**/' + includePattern,
+                exists: true
+            });
+            return this.searchService.fileSearch(query, token).then((ret) => {
+                if (!ret.limitHit) {
+                    throw Error('File not found');
+                }
+            });
+        }));
+        return Promise.any(promises).then(() => true).catch(() => false);
+    }
     async getClosedNotebookResults(textQuery, scannedFiles, token) {
         const userAssociations = this.editorResolverService.getAllUserAssociations();
         const allPriorityInfo = ( new Map());
@@ -102,14 +120,26 @@ let NotebookSearchService = class NotebookSearchService {
         });
         const promises = [];
         contributedNotebookTypes.forEach((notebook) => {
-            promises.push((async () => {
-                const canResolve = await this.notebookService.canResolve(notebook.id);
-                if (!canResolve) {
-                    return undefined;
-                }
-                const serializer = (await this.notebookService.withNotebookDataProvider(notebook.id)).serializer;
-                return await serializer.searchInNotebooks(textQuery, token, allPriorityInfo);
-            })());
+            if (notebook.selectors.length > 0) {
+                promises.push((async () => {
+                    const includes = ( notebook.selectors.map((selector) => {
+                        const globPattern = selector.include || selector;
+                        return ( globPattern.toString());
+                    }));
+                    const isInWorkspace = await this.doesFileExist(includes, textQuery.folderQueries, token);
+                    if (isInWorkspace) {
+                        const canResolve = await this.notebookService.canResolve(notebook.id);
+                        if (!canResolve) {
+                            return undefined;
+                        }
+                        const serializer = (await this.notebookService.withNotebookDataProvider(notebook.id)).serializer;
+                        return await serializer.searchInNotebooks(textQuery, token, allPriorityInfo);
+                    }
+                    else {
+                        return undefined;
+                    }
+                })());
+            }
         });
         const start = Date.now();
         const searchComplete = coalesce(await Promise.all(promises));
@@ -199,7 +229,9 @@ NotebookSearchService = ( __decorate([
     ( __param(2, ILogService)),
     ( __param(3, INotebookService)),
     ( __param(4, IConfigurationService)),
-    ( __param(5, IEditorResolverService))
+    ( __param(5, IEditorResolverService)),
+    ( __param(6, ISearchService)),
+    ( __param(7, IInstantiationService))
 ], NotebookSearchService));
 
 export { NotebookSearchService };

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

@@ -246,7 +246,11 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
                 source: targetFileExists ? FileWorkingCopyManager_1.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE : FileWorkingCopyManager_1.FILE_WORKING_COPY_SAVE_CREATE_SOURCE
             };
         }
-        const success = await targetStoredFileWorkingCopy.save({ ...options, force: true  });
+        const success = await targetStoredFileWorkingCopy.save({
+            ...options,
+            from: source,
+            force: true
+        });
         if (!success) {
             return undefined;
         }