@codingame/monaco-vscode-api 1.83.12 → 1.83.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.83.12",
+  "version": "1.83.13",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -96,10 +96,10 @@
   "dependencies": {
     "monaco-editor": "0.44.0",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-extensions-service-override": "1.83.12",
-    "@codingame/monaco-vscode-files-service-override": "1.83.12",
-    "@codingame/monaco-vscode-layout-service-override": "1.83.12",
-    "@codingame/monaco-vscode-environment-service-override": "1.83.12",
-    "@codingame/monaco-vscode-quickaccess-service-override": "1.83.12"
+    "@codingame/monaco-vscode-layout-service-override": "1.83.13",
+    "@codingame/monaco-vscode-environment-service-override": "1.83.13",
+    "@codingame/monaco-vscode-extensions-service-override": "1.83.13",
+    "@codingame/monaco-vscode-files-service-override": "1.83.13",
+    "@codingame/monaco-vscode-quickaccess-service-override": "1.83.13"
   }
 }

package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js

@@ -175,7 +175,7 @@ class CellMatch {
         this._webviewMatches.clear();
     }
     addContentMatches(textSearchMatches) {
-        const contentMatches = textSearchMatchesToNotebookMatches();
+        const contentMatches = textSearchMatchesToNotebookMatches(textSearchMatches, this);
         contentMatches.forEach((match) => {
             this._contentMatches.set(match.id(), match);
         });
@@ -193,7 +193,7 @@ class CellMatch {
         });
     }
     addWebviewMatches(textSearchMatches) {
-        const webviewMatches = textSearchMatchesToNotebookMatches();
+        const webviewMatches = textSearchMatchesToNotebookMatches(textSearchMatches, this);
         webviewMatches.forEach((match) => {
             this._webviewMatches.set(match.id(), match);
         });
@@ -1889,6 +1889,27 @@ function textSearchResultToMatches(rawMatch, fileMatch) {
 }
 function textSearchMatchesToNotebookMatches(textSearchMatches, cell) {
     const notebookMatches = [];
+    textSearchMatches.forEach((textSearchMatch) => {
+        const previewLines = textSearchMatch.preview.text.split('\n');
+        if (Array.isArray(textSearchMatch.ranges)) {
+            textSearchMatch.ranges.forEach((r, i) => {
+                const previewRange = textSearchMatch.preview.matches[i];
+                const match = ( new MatchInNotebook(cell, previewLines, previewRange, r, textSearchMatch.webviewIndex));
+                notebookMatches.push(match);
+            });
+        }
+        else {
+            const previewRange = textSearchMatch.preview.matches;
+            const match = ( new MatchInNotebook(
+                cell,
+                previewLines,
+                previewRange,
+                textSearchMatch.ranges,
+                textSearchMatch.webviewIndex
+            ));
+            notebookMatches.push(match);
+        }
+    });
     return notebookMatches;
 }
 function arrayContainsElementOrParent(element, testArray) {

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

@@ -1,397 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { joinPath } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { deepClone, equals } from 'monaco-editor/esm/vs/base/common/objects.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 'monaco-editor/esm/vs/base/common/map.js';
-import { isReadableStream, peekStream } from 'monaco-editor/esm/vs/base/common/stream.js';
-import { VSBuffer, prefixedBufferStream, prefixedBufferReadable, bufferToStream, streamToBuffer, readableToBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { hash } from 'monaco-editor/esm/vs/base/common/hash.js';
-import { isEmptyObject } from 'monaco-editor/esm/vs/base/common/types.js';
-import { NO_TYPE_ID } from './workingCopy.js';
-var WorkingCopyBackupServiceImpl_1;
-class WorkingCopyBackupsModel {
-    static async create(backupRoot, fileService) {
-        const model = ( new WorkingCopyBackupsModel(backupRoot, fileService));
-        await model.resolve();
-        return model;
-    }
-    constructor(backupRoot, fileService) {
-        this.backupRoot = backupRoot;
-        this.fileService = fileService;
-        this.cache = ( new ResourceMap());
-    }
-    async resolve() {
-        try {
-            const backupRootStat = await this.fileService.resolve(this.backupRoot);
-            if (backupRootStat.children) {
-                await Promises.settled(( backupRootStat.children
-                    .filter(child => child.isDirectory)
-                    .map(async (backupSchemaFolder) => {
-                    const backupSchemaFolderStat = await this.fileService.resolve(backupSchemaFolder.resource);
-                    if (backupSchemaFolderStat.children) {
-                        for (const backupForSchema of backupSchemaFolderStat.children) {
-                            if (!backupForSchema.isDirectory) {
-                                this.add(backupForSchema.resource);
-                            }
-                        }
-                    }
-                })));
-            }
-        }
-        catch (error) {
-        }
-    }
-    add(resource, versionId = 0, meta) {
-        this.cache.set(resource, {
-            versionId,
-            meta: deepClone(meta)
-        });
-    }
-    update(resource, meta) {
-        const entry = this.cache.get(resource);
-        if (entry) {
-            entry.meta = deepClone(meta);
-        }
-    }
-    count() {
-        return this.cache.size;
-    }
-    has(resource, versionId, meta) {
-        const entry = this.cache.get(resource);
-        if (!entry) {
-            return false;
-        }
-        if (typeof versionId === 'number' && versionId !== entry.versionId) {
-            return false;
-        }
-        if (meta && !equals(meta, entry.meta)) {
-            return false;
-        }
-        return true;
-    }
-    get() {
-        return Array.from(( this.cache.keys()));
-    }
-    remove(resource) {
-        this.cache.delete(resource);
-    }
-    clear() {
-        this.cache.clear();
-    }
-}
-let WorkingCopyBackupServiceImpl = class WorkingCopyBackupServiceImpl extends Disposable {
-    static { WorkingCopyBackupServiceImpl_1 = this; }
-    static { this.PREAMBLE_END_MARKER = '\n'; }
-    static { this.PREAMBLE_END_MARKER_CHARCODE = '\n'.charCodeAt(0); }
-    static { this.PREAMBLE_META_SEPARATOR = ' '; }
-    static { this.PREAMBLE_MAX_LENGTH = 10000; }
-    constructor(backupWorkspaceHome, fileService, logService) {
-        super();
-        this.backupWorkspaceHome = backupWorkspaceHome;
-        this.fileService = fileService;
-        this.logService = logService;
-        this.ioOperationQueues = this._register(( new ResourceQueue()));
-        this.model = undefined;
-        this.initialize(backupWorkspaceHome);
-    }
-    initialize(backupWorkspaceResource) {
-        this.backupWorkspaceHome = backupWorkspaceResource;
-        this.ready = this.doInitialize();
-    }
-    async doInitialize() {
-        this.model = await WorkingCopyBackupsModel.create(this.backupWorkspaceHome, this.fileService);
-        return this.model;
-    }
-    async hasBackups() {
-        const model = await this.ready;
-        await this.joinBackups();
-        return model.count() > 0;
-    }
-    hasBackupSync(identifier, versionId, meta) {
-        if (!this.model) {
-            return false;
-        }
-        const backupResource = this.toBackupResource(identifier);
-        return ( this.model.has(backupResource, versionId, meta));
-    }
-    async backup(identifier, content, versionId, meta, token) {
-        const model = await this.ready;
-        if (token?.isCancellationRequested) {
-            return;
-        }
-        const backupResource = this.toBackupResource(identifier);
-        if (( model.has(backupResource, versionId, meta))) {
-            return;
-        }
-        return this.ioOperationQueues.queueFor(backupResource).queue(async () => {
-            if (token?.isCancellationRequested) {
-                return;
-            }
-            if (( model.has(backupResource, versionId, meta))) {
-                return;
-            }
-            let preamble = this.createPreamble(identifier, meta);
-            if (preamble.length >= WorkingCopyBackupServiceImpl_1.PREAMBLE_MAX_LENGTH) {
-                preamble = this.createPreamble(identifier);
-            }
-            const preambleBuffer = VSBuffer.fromString(preamble);
-            let backupBuffer;
-            if (isReadableStream(content)) {
-                backupBuffer = prefixedBufferStream(preambleBuffer, content);
-            }
-            else if (content) {
-                backupBuffer = prefixedBufferReadable(preambleBuffer, content);
-            }
-            else {
-                backupBuffer = VSBuffer.concat([preambleBuffer, VSBuffer.fromString('')]);
-            }
-            await this.fileService.writeFile(backupResource, backupBuffer);
-            model.add(backupResource, versionId, meta);
-        });
-    }
-    createPreamble(identifier, meta) {
-        return `${( identifier.resource.toString())}${WorkingCopyBackupServiceImpl_1.PREAMBLE_META_SEPARATOR}${JSON.stringify({ ...meta, typeId: identifier.typeId })}${WorkingCopyBackupServiceImpl_1.PREAMBLE_END_MARKER}`;
-    }
-    async discardBackups(filter) {
-        const model = await this.ready;
-        const except = filter?.except;
-        if (Array.isArray(except) && except.length > 0) {
-            const exceptMap = ( new ResourceMap());
-            for (const exceptWorkingCopy of except) {
-                exceptMap.set(this.toBackupResource(exceptWorkingCopy), true);
-            }
-            await Promises.settled(( model.get().map(async (backupResource) => {
-                if (!( exceptMap.has(backupResource))) {
-                    await this.doDiscardBackup(backupResource);
-                }
-            })));
-        }
-        else {
-            await this.deleteIgnoreFileNotFound(this.backupWorkspaceHome);
-            model.clear();
-        }
-    }
-    discardBackup(identifier, token) {
-        const backupResource = this.toBackupResource(identifier);
-        return this.doDiscardBackup(backupResource, token);
-    }
-    async doDiscardBackup(backupResource, token) {
-        const model = await this.ready;
-        if (token?.isCancellationRequested) {
-            return;
-        }
-        return this.ioOperationQueues.queueFor(backupResource).queue(async () => {
-            if (token?.isCancellationRequested) {
-                return;
-            }
-            await this.deleteIgnoreFileNotFound(backupResource);
-            model.remove(backupResource);
-        });
-    }
-    async deleteIgnoreFileNotFound(backupResource) {
-        try {
-            await this.fileService.del(backupResource, { recursive: true });
-        }
-        catch (error) {
-            if (error.fileOperationResult !== 1 ) {
-                throw error;
-            }
-        }
-    }
-    async getBackups() {
-        const model = await this.ready;
-        await this.joinBackups();
-        const backups = await Promise.all(( model.get().map(backupResource => this.resolveIdentifier(backupResource, model))));
-        return coalesce(backups);
-    }
-    async resolveIdentifier(backupResource, model) {
-        let res = undefined;
-        await this.ioOperationQueues.queueFor(backupResource).queue(async () => {
-            if (!( model.has(backupResource))) {
-                return;
-            }
-            const backupPreamble = await this.readToMatchingString(backupResource, WorkingCopyBackupServiceImpl_1.PREAMBLE_END_MARKER, WorkingCopyBackupServiceImpl_1.PREAMBLE_MAX_LENGTH);
-            if (!backupPreamble) {
-                return;
-            }
-            const metaStartIndex = backupPreamble.indexOf(WorkingCopyBackupServiceImpl_1.PREAMBLE_META_SEPARATOR);
-            let resourcePreamble;
-            let metaPreamble;
-            if (metaStartIndex > 0) {
-                resourcePreamble = backupPreamble.substring(0, metaStartIndex);
-                metaPreamble = backupPreamble.substr(metaStartIndex + 1);
-            }
-            else {
-                resourcePreamble = backupPreamble;
-                metaPreamble = undefined;
-            }
-            const { typeId, meta } = this.parsePreambleMeta(metaPreamble);
-            model.update(backupResource, meta);
-            res = {
-                typeId: typeId ?? NO_TYPE_ID,
-                resource: ( URI.parse(resourcePreamble))
-            };
-        });
-        return res;
-    }
-    async readToMatchingString(backupResource, matchingString, maximumBytesToRead) {
-        const contents = ( (await this.fileService.readFile(backupResource, { length: maximumBytesToRead })).value.toString());
-        const matchingStringIndex = contents.indexOf(matchingString);
-        if (matchingStringIndex >= 0) {
-            return contents.substr(0, matchingStringIndex);
-        }
-        return undefined;
-    }
-    async resolve(identifier) {
-        const backupResource = this.toBackupResource(identifier);
-        const model = await this.ready;
-        let res = undefined;
-        await this.ioOperationQueues.queueFor(backupResource).queue(async () => {
-            if (!( model.has(backupResource))) {
-                return;
-            }
-            const backupStream = await this.fileService.readFileStream(backupResource);
-            const peekedBackupStream = await peekStream(backupStream.value, 1);
-            const firstBackupChunk = VSBuffer.concat(peekedBackupStream.buffer);
-            const preambleEndIndex = firstBackupChunk.buffer.indexOf(WorkingCopyBackupServiceImpl_1.PREAMBLE_END_MARKER_CHARCODE);
-            if (preambleEndIndex === -1) {
-                this.logService.trace(`Backup: Could not find meta end marker in ${backupResource}. The file is probably corrupt (filesize: ${backupStream.size}).`);
-                return undefined;
-            }
-            const preambelRaw = ( firstBackupChunk.slice(0, preambleEndIndex).toString());
-            let meta;
-            const metaStartIndex = preambelRaw.indexOf(WorkingCopyBackupServiceImpl_1.PREAMBLE_META_SEPARATOR);
-            if (metaStartIndex !== -1) {
-                meta = this.parsePreambleMeta(preambelRaw.substr(metaStartIndex + 1)).meta;
-            }
-            model.update(backupResource, meta);
-            const firstBackupChunkWithoutPreamble = firstBackupChunk.slice(preambleEndIndex + 1);
-            let value;
-            if (peekedBackupStream.ended) {
-                value = bufferToStream(firstBackupChunkWithoutPreamble);
-            }
-            else {
-                value = prefixedBufferStream(firstBackupChunkWithoutPreamble, peekedBackupStream.stream);
-            }
-            res = { value, meta };
-        });
-        return res;
-    }
-    parsePreambleMeta(preambleMetaRaw) {
-        let typeId = undefined;
-        let meta = undefined;
-        if (preambleMetaRaw) {
-            try {
-                meta = JSON.parse(preambleMetaRaw);
-                typeId = meta?.typeId;
-                if (typeof meta?.typeId === 'string') {
-                    delete meta.typeId;
-                    if (isEmptyObject(meta)) {
-                        meta = undefined;
-                    }
-                }
-            }
-            catch (error) {
-            }
-        }
-        return { typeId, meta };
-    }
-    toBackupResource(identifier) {
-        return joinPath(this.backupWorkspaceHome, identifier.resource.scheme, hashIdentifier(identifier));
-    }
-    joinBackups() {
-        return this.ioOperationQueues.whenDrained();
-    }
-};
-WorkingCopyBackupServiceImpl = WorkingCopyBackupServiceImpl_1 = ( __decorate([
-    ( __param(1, IFileService)),
-    ( __param(2, ILogService))
-], WorkingCopyBackupServiceImpl));
-class InMemoryWorkingCopyBackupService extends Disposable {
-    constructor() {
-        super();
-        this.backups = ( new ResourceMap());
-    }
-    async hasBackups() {
-        return this.backups.size > 0;
-    }
-    hasBackupSync(identifier, versionId) {
-        const backupResource = this.toBackupResource(identifier);
-        return ( this.backups.has(backupResource));
-    }
-    async backup(identifier, content, versionId, meta, token) {
-        const backupResource = this.toBackupResource(identifier);
-        this.backups.set(backupResource, {
-            typeId: identifier.typeId,
-            content: content instanceof VSBuffer ? content : content ? isReadableStream(content) ? await streamToBuffer(content) : readableToBuffer(content) : VSBuffer.fromString(''),
-            meta
-        });
-    }
-    async resolve(identifier) {
-        const backupResource = this.toBackupResource(identifier);
-        const backup = this.backups.get(backupResource);
-        if (backup) {
-            return { value: bufferToStream(backup.content), meta: backup.meta };
-        }
-        return undefined;
-    }
-    async getBackups() {
-        return ( Array.from(this.backups.entries()).map(([resource, backup]) => ({ typeId: backup.typeId, resource })));
-    }
-    async discardBackup(identifier) {
-        this.backups.delete(this.toBackupResource(identifier));
-    }
-    async discardBackups(filter) {
-        const except = filter?.except;
-        if (Array.isArray(except) && except.length > 0) {
-            const exceptMap = ( new ResourceMap());
-            for (const exceptWorkingCopy of except) {
-                exceptMap.set(this.toBackupResource(exceptWorkingCopy), true);
-            }
-            for (const backup of await this.getBackups()) {
-                if (!( exceptMap.has(this.toBackupResource(backup)))) {
-                    await this.discardBackup(backup);
-                }
-            }
-        }
-        else {
-            this.backups.clear();
-        }
-    }
-    toBackupResource(identifier) {
-        return ( URI.from({ scheme: Schemas.inMemory, path: hashIdentifier(identifier) }));
-    }
-    async joinBackups() {
-        return;
-    }
-}
-function hashIdentifier(identifier) {
-    let resource;
-    if (identifier.typeId.length > 0) {
-        const typeIdHash = hashString(identifier.typeId);
-        if (identifier.resource.path) {
-            resource = joinPath(identifier.resource, typeIdHash);
-        }
-        else {
-            resource = identifier.resource.with({ path: typeIdHash });
-        }
-    }
-    else {
-        resource = identifier.resource;
-    }
-    return hashPath(resource);
-}
-function hashPath(resource) {
-    const str = resource.scheme === Schemas.file || resource.scheme === Schemas.untitled ? resource.fsPath : ( resource.toString());
-    return hashString(str);
-}
-function hashString(str) {
-    return ( hash(str).toString(16));
-}
-export { InMemoryWorkingCopyBackupService, WorkingCopyBackupsModel, hashIdentifier };