@codingame/monaco-vscode-api 1.83.15 → 1.85.0-next.0

package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js

@@ -208,6 +208,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         if (usePosition) {
             this.show(position, height);
         }
+        this.editor.setPosition(position);
         this.editor.focus();
     }
     renderTitle(label) {
@@ -633,8 +634,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         this.enabled = false;
         this.gutterActionDisposables = ( new DisposableStore());
         this.enabled = !contextKeyService.getContextKeyValue('isInDiffEditor');
-        this.stylesheet = dom.createStyleSheet();
-        this._register(toDisposable(() => this.stylesheet.remove()));
+        this.stylesheet = dom.createStyleSheet(undefined, undefined, this._store);
         if (this.enabled) {
             this.isDirtyDiffVisible = isDirtyDiffVisible.bindTo(contextKeyService);
             this._register(editor.onDidChangeModel(() => this.close()));
@@ -1352,8 +1352,7 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         this.viewState = { width: 3, visibility: 'always' };
         this.items = ( new ResourceMap());
         this.transientDisposables = this._register(( new DisposableStore()));
-        this.stylesheet = dom.createStyleSheet();
-        this._register(toDisposable(() => this.stylesheet.parentElement.removeChild(this.stylesheet)));
+        this.stylesheet = dom.createStyleSheet(undefined, undefined, this._store);
         const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorations'));
         this._register(onDidChangeConfiguration(this.onDidChangeConfiguration, this));
         this.onDidChangeConfiguration();
@@ -1454,8 +1453,14 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         for (const [uri, item] of this.items) {
             for (const editorId of ( item.keys())) {
                 if (!this.editorService.visibleTextEditorControls.find(editor => isCodeEditor(editor) && editor.getModel()?.uri.toString() === ( uri.toString()) && editor.getId() === editorId)) {
-                    dispose(( item.values()));
-                    this.items.delete(uri);
+                    if (( item.has(editorId))) {
+                        const dirtyDiffItem = item.get(editorId);
+                        dirtyDiffItem?.dispose();
+                        item.delete(editorId);
+                        if (item.size === 0) {
+                            this.items.delete(uri);
+                        }
+                    }
                 }
             }
         }

package/vscode/src/vs/workbench/contrib/scm/common/scm.js

@@ -2,7 +2,6 @@ import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/com
 const VIEWLET_ID = 'workbench.view.scm';
 const VIEW_PANE_ID = 'workbench.scm';
 const REPOSITORIES_VIEW_PANE_ID = 'workbench.scm.repositories';
-const SYNC_VIEW_PANE_ID = 'workbench.scm.sync';
 const ISCMService = ( createDecorator('scm'));
 var SCMInputChangeReason;
 ( (function(SCMInputChangeReason) {
@@ -10,4 +9,4 @@ var SCMInputChangeReason;
     SCMInputChangeReason[SCMInputChangeReason["HistoryNext"] = 1] = "HistoryNext";
 })(SCMInputChangeReason || (SCMInputChangeReason = {})));
 const ISCMViewService = ( createDecorator('scmView'));
-export { ISCMService, ISCMViewService, REPOSITORIES_VIEW_PANE_ID, SCMInputChangeReason, SYNC_VIEW_PANE_ID, VIEWLET_ID, VIEW_PANE_ID };
+export { ISCMService, ISCMViewService, REPOSITORIES_VIEW_PANE_ID, SCMInputChangeReason, VIEWLET_ID, VIEW_PANE_ID };

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

@@ -0,0 +1,31 @@
+import { TextSearchMatch } from '../../../../services/search/common/search.js';
+import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
+import { genericCellMatchesToTextSearchMatches, rawCellPrefix } from '../../common/searchNotebookHelpers.js';
+function getIDFromINotebookCellMatch(match) {
+    if (isINotebookCellMatchWithModel(match)) {
+        return match.cell.id;
+    }
+    else {
+        return `${rawCellPrefix}${match.index}`;
+    }
+}
+function isINotebookFileMatchWithModel(object) {
+    return 'cellResults' in object && object.cellResults instanceof Array && object.cellResults.every(isINotebookCellMatchWithModel);
+}
+function isINotebookCellMatchWithModel(object) {
+    return 'cell' in object;
+}
+function contentMatchesToTextSearchMatches(contentMatches, cell) {
+    return genericCellMatchesToTextSearchMatches(contentMatches, cell.textBuffer);
+}
+function webviewMatchesToTextSearchMatches(webviewMatches) {
+    return ( webviewMatches
+        .map(rawMatch => (rawMatch.searchPreviewInfo) ?
+        ( new TextSearchMatch(rawMatch.searchPreviewInfo.line, ( new Range(
+            0,
+            rawMatch.searchPreviewInfo.range.start,
+            0,
+            rawMatch.searchPreviewInfo.range.end
+        )), undefined, rawMatch.index)) : undefined)).filter((e) => !!e);
+}
+export { contentMatchesToTextSearchMatches, getIDFromINotebookCellMatch, isINotebookCellMatchWithModel, isINotebookFileMatchWithModel, webviewMatchesToTextSearchMatches };

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

@@ -29,11 +29,13 @@ import { NotebookEditorWidget } from '../../../../../../../override/vs/workbench
 import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
 import { NotebookCellsChangeType } from '../../notebook/common/notebookCommon.js';
 import { IReplaceService } from './replace.js';
-import { isIFileMatchWithCells, rawCellPrefix, contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches, CellSearchModel } from './searchNotebookHelpers.js';
+import { isINotebookFileMatchWithModel, contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches, isINotebookCellMatchWithModel, getIDFromINotebookCellMatch } from './notebookSearch/searchNotebookHelpers.js';
 import { INotebookSearchService } from '../common/notebookSearch.js';
+import { isINotebookFileMatchNoModel, rawCellPrefix } from '../common/searchNotebookHelpers.js';
 import { ReplacePattern } from '../../../services/search/common/replace.js';
 import { OneLineRange, resultIsMatch, ISearchService } from '../../../services/search/common/search.js';
-import { editorMatchesToTextSearchResults, addContextToEditorMatches } from '../../../services/search/common/searchHelpers.js';
+import { editorMatchesToTextSearchResults, getTextSearchMatchWithModelContext } from '../../../services/search/common/searchHelpers.js';
+import { CellSearchModel } from '../common/cellSearchModel.js';
 var FileMatch_1, FolderMatch_1, RangeHighlightDecorations_1;
 class Match {
     static { this.MAX_PREVIEW_CHARS = 250; }
@@ -149,6 +151,9 @@ class CellMatch {
         this._webviewMatches = ( new Map());
         this._context = ( new Map());
     }
+    hasCellViewModel() {
+        return !(this._cell instanceof CellSearchModel);
+    }
     get context() {
         return ( new Map(this._context));
     }
@@ -182,11 +187,11 @@ class CellMatch {
         this.addContext(textSearchMatches);
     }
     addContext(textSearchMatches) {
-        if (this.cell instanceof CellSearchModel) {
+        if (!this.cell) {
             return;
         }
         this.cell.resolveTextModel().then((textModel) => {
-            const textResultsWithContext = addContextToEditorMatches(textSearchMatches, textModel, this.parent.parent().query);
+            const textResultsWithContext = getTextSearchMatchWithModelContext(textSearchMatches, textModel, this.parent.parent().query);
             const contexts = textResultsWithContext.filter((result => !resultIsMatch(result)));
             ( contexts.map(context => ({ ...context, lineNumber: context.lineNumber + 1 })))
                 .forEach((context) => { this._context.set(context.lineNumber, context.text); });
@@ -205,7 +210,7 @@ class CellMatch {
         return this._parent;
     }
     get id() {
-        return this._cell.id;
+        return this._cell?.id ?? `${rawCellPrefix}${this.cellIndex}`;
     }
     get cellIndex() {
         return this._cellIndex;
@@ -233,6 +238,9 @@ class MatchInNotebook extends Match {
     isWebviewMatch() {
         return this._webviewIndex !== undefined;
     }
+    isReadonly() {
+        return (!this._cellParent.hasCellViewModel()) || this.isWebviewMatch();
+    }
     get cellIndex() {
         return this._cellParent.cellIndex;
     }
@@ -335,16 +343,20 @@ let FileMatch = class FileMatch extends Disposable {
         return this._cellMatches.get(cellID);
     }
     addCellMatch(rawCell) {
-        const cellMatch = ( new CellMatch(this, rawCell.cell, rawCell.index));
+        const cellMatch = ( new CellMatch(
+            this,
+            isINotebookCellMatchWithModel(rawCell) ? rawCell.cell : undefined,
+            rawCell.index
+        ));
         this._cellMatches.set(cellMatch.id, cellMatch);
-        this.addWebviewMatchesToCell(rawCell.cell.id, rawCell.webviewResults);
-        this.addContentMatchesToCell(rawCell.cell.id, rawCell.contentResults);
+        this.addWebviewMatchesToCell(cellMatch.id, rawCell.webviewResults);
+        this.addContentMatchesToCell(cellMatch.id, rawCell.contentResults);
     }
     get closestRoot() {
         return this._closestRoot;
     }
-    hasWebviewMatches() {
-        return ( this.matches().some(m => m instanceof MatchInNotebook && m.isWebviewMatch()));
+    hasReadonlyMatches() {
+        return ( this.matches().some(m => m instanceof MatchInNotebook && m.isReadonly()));
     }
     createMatches() {
         const model = this.modelService.getModel(this._resource);
@@ -365,7 +377,7 @@ let FileMatch = class FileMatch extends Disposable {
                         .forEach(m => this.add(m));
                 });
             }
-            if (isIFileMatchWithCells(this.rawMatch)) {
+            if (isINotebookFileMatchWithModel(this.rawMatch) || isINotebookFileMatchNoModel(this.rawMatch)) {
                 this.rawMatch.cellResults?.forEach(cell => this.addCellMatch(cell));
                 this.setNotebookFindMatchDecorationsUsingCellMatches(this.cellMatches());
                 this._onChange.fire({ forceUpdateModel: true });
@@ -433,9 +445,7 @@ let FileMatch = class FileMatch extends Disposable {
                 }
             });
         });
-        this.addContext(( addContextToEditorMatches(textSearchResults, model, this.parent().parent().query)
-            .filter((result => !resultIsMatch(result)))
-            .map(context => ({ ...context, lineNumber: context.lineNumber + 1 }))));
+        this.addContext(getTextSearchMatchWithModelContext(textSearchResults, model, this.parent().parent().query));
         this._onChange.fire({ forceUpdateModel: modelChange });
         this.updateHighlights();
     }
@@ -568,7 +578,7 @@ let FileMatch = class FileMatch extends Disposable {
         super.dispose();
     }
     hasOnlyReadOnlyMatches() {
-        return this.matches().every(match => (match instanceof MatchInNotebook && match.isWebviewMatch()));
+        return this.matches().every(match => (match instanceof MatchInNotebook && match.isReadonly()));
     }
     bindNotebookEditorWidget(widget) {
         if (this._notebookEditorWidget === widget) {
@@ -643,6 +653,7 @@ let FileMatch = class FileMatch extends Disposable {
                     existingCell = existingRawCell;
                 }
             }
+            existingCell?.clearAllMatches();
             const cell = existingCell ?? ( new CellMatch(this, match.cell, match.index));
             cell.addContentMatches(contentMatchesToTextSearchMatches(match.contentMatches, match.cell));
             cell.addWebviewMatches(webviewMatchesToTextSearchMatches(match.webviewMatches));
@@ -705,7 +716,7 @@ let FileMatch = class FileMatch extends Disposable {
         this.revealCellRange(match, offset);
     }
     async highlightCurrentFindMatchDecoration(match) {
-        if (!this._findMatchDecorationModel || match.cell instanceof CellSearchModel) {
+        if (!this._findMatchDecorationModel || !match.cell) {
             return null;
         }
         if (match.webviewIndex === undefined) {
@@ -716,13 +727,13 @@ let FileMatch = class FileMatch extends Disposable {
         }
     }
     revealCellRange(match, outputOffset) {
-        if (!this._notebookEditorWidget || match.cell instanceof CellSearchModel) {
+        if (!this._notebookEditorWidget || !match.cell) {
             return;
         }
         if (match.webviewIndex !== undefined) {
             const index = this._notebookEditorWidget.getCellIndex(match.cell);
             if (index !== undefined) {
-                this._notebookEditorWidget.revealCellOffsetInCenterAsync(match.cell, outputOffset ?? 0);
+                this._notebookEditorWidget.revealCellOffsetInCenter(match.cell, outputOffset ?? 0);
             }
         }
         else {
@@ -827,14 +838,14 @@ let FolderMatch = FolderMatch_1 = class FolderMatch extends Disposable {
         }
     }
     createIntermediateFolderMatch(resource, id, index, query, baseWorkspaceFolder) {
-        const folderMatch = this.instantiationService.createInstance(FolderMatchWithResource, resource, id, index, query, this, this._searchResult, baseWorkspaceFolder);
+        const folderMatch = this._register(this.instantiationService.createInstance(FolderMatchWithResource, resource, id, index, query, this, this._searchResult, baseWorkspaceFolder));
         this.configureIntermediateMatch(folderMatch);
         this.doAddFolder(folderMatch);
         return folderMatch;
     }
     configureIntermediateMatch(folderMatch) {
         const disposable = folderMatch.onChange((event) => this.onFolderChange(folderMatch, event));
-        folderMatch.onDispose(() => disposable.dispose());
+        this._register(folderMatch.onDispose(() => disposable.dispose()));
     }
     clear(clearingAll = false) {
         const changed = this.allDownstreamFileMatches();
@@ -922,9 +933,9 @@ let FolderMatch = FolderMatch_1 = class FolderMatch extends Disposable {
                             .forEach(m => existingFileMatch.add(m));
                     });
                 }
-                if (isIFileMatchWithCells(rawFileMatch)) {
+                if (isINotebookFileMatchWithModel(rawFileMatch) || isINotebookFileMatchNoModel(rawFileMatch)) {
                     rawFileMatch.cellResults?.forEach(rawCellMatch => {
-                        const existingCellMatch = existingFileMatch.getCellMatch(rawCellMatch.cell.id);
+                        const existingCellMatch = existingFileMatch.getCellMatch(getIDFromINotebookCellMatch(rawCellMatch));
                         if (existingCellMatch) {
                             existingCellMatch.addContentMatches(rawCellMatch.contentResults);
                             existingCellMatch.addWebviewMatches(rawCellMatch.webviewResults);
@@ -935,7 +946,9 @@ let FolderMatch = FolderMatch_1 = class FolderMatch extends Disposable {
                     });
                 }
                 updated.push(existingFileMatch);
-                existingFileMatch.addContext(rawFileMatch.results);
+                if (rawFileMatch.results && rawFileMatch.results.length > 0) {
+                    existingFileMatch.addContext(rawFileMatch.results);
+                }
             }
             else {
                 if (this instanceof FolderMatchWorkspaceRoot || this instanceof FolderMatchNoRoot) {
@@ -1022,7 +1035,7 @@ let FolderMatch = FolderMatch_1 = class FolderMatch extends Disposable {
         const removed = [];
         for (const match of fileMatches) {
             if (this._fileMatches.get(match.resource)) {
-                if (keepReadonly && match.hasWebviewMatches()) {
+                if (keepReadonly && match.hasReadonlyMatches()) {
                     continue;
                 }
                 this._fileMatches.delete(match.resource);
@@ -1104,7 +1117,7 @@ let FolderMatchWorkspaceRoot = class FolderMatchWorkspaceRoot extends FolderMatc
         const fileMatch = this.instantiationService.createInstance(FileMatch, query, previewOptions, maxResults, parent, rawFileMatch, closestRoot, searchInstanceID);
         parent.doAddFile(fileMatch);
         const disposable = fileMatch.onChange(({ didRemove }) => parent.onFileChange(fileMatch, didRemove));
-        fileMatch.onDispose(() => disposable.dispose());
+        this._register(fileMatch.onDispose(() => disposable.dispose()));
         return fileMatch;
     }
     createAndConfigureFileMatch(rawFileMatch, searchInstanceID) {
@@ -1144,10 +1157,10 @@ let FolderMatchNoRoot = class FolderMatchNoRoot extends FolderMatch {
         super(null, _id, _index, _query, _parent, _parent, null, replaceService, instantiationService, labelService, uriIdentityService);
     }
     createAndConfigureFileMatch(rawFileMatch, searchInstanceID) {
-        const fileMatch = this.instantiationService.createInstance(FileMatch, this._query.contentPattern, this._query.previewOptions, this._query.maxResults, this, rawFileMatch, null, searchInstanceID);
+        const fileMatch = this._register(this.instantiationService.createInstance(FileMatch, this._query.contentPattern, this._query.previewOptions, this._query.maxResults, this, rawFileMatch, null, searchInstanceID));
         this.doAddFile(fileMatch);
         const disposable = fileMatch.onChange(({ didRemove }) => this.onFileChange(fileMatch, didRemove));
-        fileMatch.onDispose(() => disposable.dispose());
+        this._register(fileMatch.onDispose(() => disposable.dispose()));
         return fileMatch;
     }
 };
@@ -1290,7 +1303,7 @@ let SearchResult = class SearchResult extends Disposable {
         this._folderMatchesMap = TernarySearchTree.forUris(key => this.uriIdentityService.extUri.ignorePathCasing(key));
         this._showHighlights = false;
         this._query = null;
-        this.disposePastResults = () => { };
+        this.disposePastResults = () => Promise.resolve();
         this._isDirty = false;
         this._rangeHighlightDecorations = this.instantiationService.createInstance(RangeHighlightDecorations);
         this.modelService.getModels().forEach(model => this.onModelAdded(model));
@@ -1352,10 +1365,11 @@ let SearchResult = class SearchResult extends Disposable {
     }
     set query(query) {
         const oldFolderMatches = this.folderMatches();
-        ( new Promise(resolve => this.disposePastResults = resolve))
-            .then(() => oldFolderMatches.forEach(match => match.clear()))
-            .then(() => oldFolderMatches.forEach(match => match.dispose()))
-            .then(() => this._isDirty = false);
+        this.disposePastResults = async () => {
+            oldFolderMatches.forEach(match => match.clear());
+            oldFolderMatches.forEach(match => match.dispose());
+            this._isDirty = false;
+        };
         this._rangeHighlightDecorations.removeHighlightRange();
         this._folderMatchesMap = TernarySearchTree.forUris(key => this.uriIdentityService.extUri.ignorePathCasing(key));
         if (!query) {
@@ -1397,13 +1411,13 @@ let SearchResult = class SearchResult extends Disposable {
     _createBaseFolderMatch(resource, id, index, query) {
         let folderMatch;
         if (resource) {
-            folderMatch = this.instantiationService.createInstance(FolderMatchWorkspaceRoot, resource, id, index, query, this);
+            folderMatch = this._register(this.instantiationService.createInstance(FolderMatchWorkspaceRoot, resource, id, index, query, this));
         }
         else {
-            folderMatch = this.instantiationService.createInstance(FolderMatchNoRoot, id, index, query, this);
+            folderMatch = this._register(this.instantiationService.createInstance(FolderMatchNoRoot, id, index, query, this));
         }
         const disposable = folderMatch.onChange((event) => this._onChange.fire(event));
-        folderMatch.onDispose(() => disposable.dispose());
+        this._register(folderMatch.onDispose(() => disposable.dispose()));
         return folderMatch;
     }
     add(allRaw, searchInstanceID, silent = false) {
@@ -1547,13 +1561,13 @@ let SearchResult = class SearchResult extends Disposable {
         this._folderMatchesMap = TernarySearchTree.forUris(key => this.uriIdentityService.extUri.ignorePathCasing(key));
         this._rangeHighlightDecorations.removeHighlightRange();
     }
-    dispose() {
+    async dispose() {
         this._onWillChangeModelListener?.dispose();
         this._onDidChangeModelListener?.dispose();
-        this.disposePastResults();
-        this.disposeMatches();
         this._rangeHighlightDecorations.dispose();
+        this.disposeMatches();
         super.dispose();
+        await this.disposePastResults();
     }
 };
 SearchResult = ( __decorate([
@@ -1672,7 +1686,7 @@ let SearchModel = class SearchModel extends Disposable {
         }
         const searchInstanceID = ( Date.now().toString());
         this._searchResult.query = this._searchQuery;
-        const progressEmitter = ( new Emitter());
+        const progressEmitter = this._register(( new Emitter()));
         this._replacePattern = ( new ReplacePattern(this.replaceString, this._searchQuery.contentPattern));
         this._startStreamDelay = ( new Promise(resolve => setTimeout(resolve, this.searchConfig.searchOnType ? 150 : 0)));
         const req = this.doSearch(query, progressEmitter, this._searchQuery, searchInstanceID, onProgress, callerToken);
@@ -1686,7 +1700,13 @@ let SearchModel = class SearchModel extends Disposable {
             });
         }
         const start = Date.now();
-        Promise.race([asyncResults, Event.toPromise(progressEmitter.event)]).finally(() => {
+        let event;
+        const progressEmitterPromise = ( new Promise(resolve => {
+            event = Event.once(progressEmitter.event)(resolve);
+            return event;
+        }));
+        Promise.race([asyncResults, progressEmitterPromise]).finally(() => {
+            event?.dispose();
             this.telemetryService.publicLog('searchResultsFirstRender', { duration: Date.now() - start });
         });
         try {
@@ -1860,9 +1880,9 @@ let RangeHighlightDecorations = class RangeHighlightDecorations {
     dispose() {
         if (this._model) {
             this.removeHighlightRange();
-            this._modelDisposables.dispose();
             this._model = null;
         }
+        this._modelDisposables.dispose();
     }
     static { this._RANGE_HIGHLIGHT_DECORATION = ModelDecorationOptions.register({
         description: 'search-range-highlight',

package/vscode/src/vs/workbench/contrib/search/{browser/searchNotebookHelpers.js → common/cellSearchModel.js}

@@ -1,74 +1,15 @@
-import { TextSearchMatch } from '../../../services/search/common/search.js';
+import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { PieceTreeTextBufferBuilder } from 'monaco-editor/esm/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
 import { SearchParams } from 'monaco-editor/esm/vs/editor/common/model/textModelSearch.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-function isIFileMatchWithCells(object) {
-    return 'cellResults' in object;
-}
-function contentMatchesToTextSearchMatches(contentMatches, cell) {
-    return genericCellMatchesToTextSearchMatches(contentMatches, cell instanceof CellSearchModel ? cell.inputTextBuffer : cell.textBuffer);
-}
-function genericCellMatchesToTextSearchMatches(contentMatches, buffer, cell) {
-    let previousEndLine = -1;
-    const contextGroupings = [];
-    let currentContextGrouping = [];
-    contentMatches.forEach((match) => {
-        if (match.range.startLineNumber !== previousEndLine) {
-            if (currentContextGrouping.length > 0) {
-                contextGroupings.push([...currentContextGrouping]);
-                currentContextGrouping = [];
-            }
-        }
-        currentContextGrouping.push(match);
-        previousEndLine = match.range.endLineNumber;
-    });
-    if (currentContextGrouping.length > 0) {
-        contextGroupings.push([...currentContextGrouping]);
-    }
-    const textSearchResults = ( contextGroupings.map((grouping) => {
-        const lineTexts = [];
-        const firstLine = grouping[0].range.startLineNumber;
-        const lastLine = grouping[grouping.length - 1].range.endLineNumber;
-        for (let i = firstLine; i <= lastLine; i++) {
-            lineTexts.push(buffer.getLineContent(i));
-        }
-        return ( new TextSearchMatch(lineTexts.join('\n') + '\n', ( grouping.map(m => ( new Range(
-            m.range.startLineNumber - 1,
-            m.range.startColumn - 1,
-            m.range.endLineNumber - 1,
-            m.range.endColumn - 1
-        ))))));
-    }));
-    return textSearchResults;
-}
-function webviewMatchesToTextSearchMatches(webviewMatches) {
-    return ( webviewMatches
-        .map(rawMatch => (rawMatch.searchPreviewInfo) ?
-        ( new TextSearchMatch(rawMatch.searchPreviewInfo.line, ( new Range(
-            0,
-            rawMatch.searchPreviewInfo.range.start,
-            0,
-            rawMatch.searchPreviewInfo.range.end
-        )), undefined, rawMatch.index)) : undefined)).filter((e) => !!e);
-}
-const rawCellPrefix = 'rawCell#';
 class CellSearchModel extends Disposable {
-    constructor(_source, _inputTextBuffer, _outputs, _uri, _cellIndex) {
+    constructor(_source, _inputTextBuffer, _outputs) {
         super();
         this._source = _source;
         this._inputTextBuffer = _inputTextBuffer;
         this._outputs = _outputs;
-        this._uri = _uri;
-        this._cellIndex = _cellIndex;
         this._outputTextBuffers = undefined;
     }
-    get id() {
-        return `${rawCellPrefix}${this._cellIndex}`;
-    }
-    get uri() {
-        return this._uri;
-    }
     _getFullModelRange(buffer) {
         const lineCount = buffer.getLineCount();
         return ( new Range(1, 1, lineCount, this._getLineMaxColumn(buffer, lineCount)));
@@ -94,7 +35,7 @@ class CellSearchModel extends Disposable {
         if (!this._outputTextBuffers) {
             this._outputTextBuffers = ( this._outputs.map((output) => {
                 const builder = ( new PieceTreeTextBufferBuilder());
-                builder.acceptChunk(( output.data.toString()));
+                builder.acceptChunk(output);
                 const bufferFactory = builder.finish(true);
                 const { textBuffer, disposable } = bufferFactory.create(1 );
                 this._register(disposable);
@@ -130,4 +71,4 @@ class CellSearchModel extends Disposable {
         })).filter((item) => !!item);
     }
 }
-export { CellSearchModel, contentMatchesToTextSearchMatches, genericCellMatchesToTextSearchMatches, isIFileMatchWithCells, rawCellPrefix, webviewMatchesToTextSearchMatches };
+export { CellSearchModel };

package/vscode/src/vs/workbench/contrib/search/common/searchNotebookHelpers.js

@@ -0,0 +1,40 @@
+import { TextSearchMatch } from '../../../services/search/common/search.js';
+import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
+function isINotebookFileMatchNoModel(object) {
+    return 'cellResults' in object;
+}
+const rawCellPrefix = 'rawCell#';
+function genericCellMatchesToTextSearchMatches(contentMatches, buffer) {
+    let previousEndLine = -1;
+    const contextGroupings = [];
+    let currentContextGrouping = [];
+    contentMatches.forEach((match) => {
+        if (match.range.startLineNumber !== previousEndLine) {
+            if (currentContextGrouping.length > 0) {
+                contextGroupings.push([...currentContextGrouping]);
+                currentContextGrouping = [];
+            }
+        }
+        currentContextGrouping.push(match);
+        previousEndLine = match.range.endLineNumber;
+    });
+    if (currentContextGrouping.length > 0) {
+        contextGroupings.push([...currentContextGrouping]);
+    }
+    const textSearchResults = ( contextGroupings.map((grouping) => {
+        const lineTexts = [];
+        const firstLine = grouping[0].range.startLineNumber;
+        const lastLine = grouping[grouping.length - 1].range.endLineNumber;
+        for (let i = firstLine; i <= lastLine; i++) {
+            lineTexts.push(buffer.getLineContent(i));
+        }
+        return ( new TextSearchMatch(lineTexts.join('\n') + '\n', ( grouping.map(m => ( new Range(
+            m.range.startLineNumber - 1,
+            m.range.startColumn - 1,
+            m.range.endLineNumber - 1,
+            m.range.endColumn - 1
+        ))))));
+    }));
+    return textSearchResults;
+}
+export { genericCellMatchesToTextSearchMatches, isINotebookFileMatchNoModel, rawCellPrefix };

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

@@ -3,11 +3,11 @@ import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { extname, basename } from 'monaco-editor/esm/vs/base/common/path.js';
 import { SnippetParser, Placeholder, Variable, Text } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetParser.js';
 import { KnownSnippetVariableNames } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetVariables.js';
-import { IdleValue } from 'monaco-editor/esm/vs/base/common/async.js';
 import { relativePath } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { isObject } from 'monaco-editor/esm/vs/base/common/types.js';
 import { tail } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
+import { WindowIdleValue, getActiveWindow } from 'monaco-editor/esm/vs/base/browser/dom.js';
 class SnippetBodyInsights {
     constructor(body) {
         this.isBogous = false;
@@ -71,7 +71,7 @@ class Snippet {
         this.snippetIdentifier = snippetIdentifier;
         this.extensionId = extensionId;
         this.prefixLow = prefix.toLowerCase();
-        this._bodyInsights = ( new IdleValue(() => ( new SnippetBodyInsights(this.body))));
+        this._bodyInsights = ( new WindowIdleValue(getActiveWindow(), () => ( new SnippetBodyInsights(this.body))));
     }
     get codeSnippet() {
         return this._bodyInsights.value.codeSnippet;

package/vscode/src/vs/workbench/contrib/speech/common/speechService.js

@@ -0,0 +1,3 @@
+import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+const ISpeechService = ( createDecorator('speechService'));
+export { ISpeechService };

package/vscode/src/vs/workbench/contrib/terminal/browser/detachedTerminal.js

@@ -0,0 +1,92 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { Delayer } from 'monaco-editor/esm/vs/base/common/async.js';
+import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
+import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { MicrotaskDelay } from 'monaco-editor/esm/vs/base/common/symbols.js';
+import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { TerminalCapabilityStore } from '../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
+import { TerminalExtensionsRegistry } from './terminalExtensions.js';
+import { TerminalWidgetManager } from './widgets/widgetManager.js';
+let DetachedTerminal = class DetachedTerminal extends Disposable {
+    get xterm() {
+        return this._xterm;
+    }
+    constructor(_xterm, options, instantiationService) {
+        super();
+        this._xterm = _xterm;
+        this._widgets = this._register(( new TerminalWidgetManager()));
+        this.capabilities = ( new TerminalCapabilityStore());
+        this._contributions = ( new Map());
+        this._register(_xterm);
+        const contributionDescs = TerminalExtensionsRegistry.getTerminalContributions();
+        for (const desc of contributionDescs) {
+            if (( this._contributions.has(desc.id))) {
+                onUnexpectedError(( new Error(`Cannot have two terminal contributions with the same id ${desc.id}`)));
+                continue;
+            }
+            if (desc.canRunInDetachedTerminals === false) {
+                continue;
+            }
+            let contribution;
+            try {
+                contribution = instantiationService.createInstance(desc.ctor, this, options.processInfo, this._widgets);
+                this._contributions.set(desc.id, contribution);
+                this._register(contribution);
+            }
+            catch (err) {
+                onUnexpectedError(err);
+            }
+        }
+        this._register(( new Delayer(MicrotaskDelay))).trigger(() => {
+            for (const contr of ( this._contributions.values())) {
+                contr.xtermReady?.(this._xterm);
+            }
+        });
+    }
+    get selection() {
+        return this._xterm && this.hasSelection() ? this._xterm.raw.getSelection() : undefined;
+    }
+    hasSelection() {
+        return this._xterm.hasSelection();
+    }
+    clearSelection() {
+        this._xterm.clearSelection();
+    }
+    focus(force) {
+        if (force || !dom.getActiveWindow().getSelection()?.toString()) {
+            this.xterm.focus();
+        }
+    }
+    attachToElement(container, options) {
+        this.domElement = container;
+        const screenElement = this._xterm.attachToElement(container, options);
+        this._widgets.attachToElement(screenElement);
+    }
+    forceScrollbarVisibility() {
+        this.domElement?.classList.add('force-scrollbar');
+    }
+    resetScrollbarVisibility() {
+        this.domElement?.classList.remove('force-scrollbar');
+    }
+    getContribution(id) {
+        return this._contributions.get(id);
+    }
+};
+DetachedTerminal = ( __decorate([
+    ( __param(2, IInstantiationService))
+], DetachedTerminal));
+class DetachedProcessInfo {
+    constructor(initialValues) {
+        this.processState = 3 ;
+        this.ptyProcessReady = Promise.resolve();
+        this.initialCwd = '';
+        this.shouldPersist = false;
+        this.hasWrittenData = false;
+        this.hasChildProcesses = false;
+        this.capabilities = ( new TerminalCapabilityStore());
+        this.shellIntegrationNonce = '';
+        Object.assign(this, initialValues);
+    }
+}
+export { DetachedProcessInfo, DetachedTerminal };