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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "1.85.6",
+  "version": "2.0.0-v2.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CodinGame/monaco-vscode-api.git"
+    "url": "git@github.com:CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
   "private": false,
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.6",
-    "monaco-editor": "0.45.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.0-v2.1",
+    "vscode-marked": "npm:marked@=3.0.2"
   }
 }

package/search.js

@@ -1,4 +1,4 @@
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ISearchService } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { SearchService } from './vscode/src/vs/workbench/services/search/common/searchService.js';
 import { ISearchViewModelWorkbenchService, SearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';

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

@@ -1,50 +1,50 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/anythingQuickAccess.css.js';
-import { QuickPickItemScorerAccessor, QuickInputHideReason, quickPickItemScorerAccessor, IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
+import { QuickPickItemScorerAccessor, QuickInputHideReason, quickPickItemScorerAccessor, IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { PickerQuickAccessProvider, TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
-import { prepareQuery, compareItemsByFuzzyScore, scoreItemFuzzy } from 'monaco-editor/esm/vs/base/common/fuzzyScorer.js';
+import { prepareQuery, compareItemsByFuzzyScore, scoreItemFuzzy } from 'vscode/vscode/vs/base/common/fuzzyScorer';
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { extractRangeFromFilter, getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { ISearchService } from 'vscode/vscode/vs/workbench/services/search/common/search';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { untildify } from 'monaco-editor/esm/vs/base/common/labels.js';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { untildify } from 'vscode/vscode/vs/base/common/labels';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { toLocalResource, basenameOrAuthority, dirname } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { toLocalResource, basenameOrAuthority, dirname } from 'vscode/vscode/vs/base/common/resources';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { DisposableStore, MutableDisposable, Disposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { getIconClasses } from 'monaco-editor/esm/vs/editor/common/services/getIconClasses.js';
-import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
-import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { DisposableStore, MutableDisposable, Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { getIconClasses } from 'vscode/vscode/vs/editor/common/services/getIconClasses';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { isEditorInput, EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
 import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { ThrottledDelayer } from 'monaco-editor/esm/vs/base/common/async.js';
-import { top } from 'monaco-editor/esm/vs/base/common/arrays.js';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { ThrottledDelayer } from 'vscode/vscode/vs/base/common/async';
+import { top } from 'vscode/vscode/vs/base/common/arrays';
 import { FileQueryCacheState } from '../common/cacheState.js';
 import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { SymbolsQuickAccessProvider } from './symbolsQuickAccess.js';
-import { DefaultQuickAccessFilterValue, Extensions } from 'monaco-editor/esm/vs/platform/quickinput/common/quickAccess.js';
+import { DefaultQuickAccessFilterValue, Extensions } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
 import { GotoSymbolQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
-import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { getIEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
-import { stripIcons } from 'monaco-editor/esm/vs/base/common/iconLabels.js';
-import { Lazy } from 'monaco-editor/esm/vs/base/common/lazy.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { getIEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
+import { Lazy } from 'vscode/vscode/vs/base/common/lazy';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ASK_QUICK_QUESTION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
 import { IQuickChatService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 

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

@@ -1,5 +1,5 @@
 import { ReplacePreviewContentProvider } from '../replaceService.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 
 function registerContributions() {

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

@@ -1,16 +1,16 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { Toggle } from 'monaco-editor/esm/vs/base/browser/ui/toggle/toggle.js';
-import { Widget } from 'monaco-editor/esm/vs/base/browser/ui/widget.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { ContextScopedHistoryInputBox } from 'monaco-editor/esm/vs/platform/history/browser/contextScopedHistoryWidget.js';
-import { showHistoryKeybindingHint } from 'monaco-editor/esm/vs/platform/history/browser/historyWidgetKeybindingHint.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { defaultToggleStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+import { trackFocus } from 'vscode/vscode/vs/base/browser/dom';
+import { Toggle } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
+import { Widget } from 'vscode/vscode/vs/base/browser/ui/widget';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { ContextScopedHistoryInputBox } from 'vscode/vscode/vs/platform/history/browser/contextScopedHistoryWidget';
+import { showHistoryKeybindingHint } from 'vscode/vscode/vs/platform/history/browser/historyWidgetKeybindingHint';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 
 let PatternInputWidget = class PatternInputWidget extends Widget {
     static { this.OPTION_CHANGE = 'optionChange'; }
@@ -26,7 +26,7 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
         this.onCancel = this._onCancel.event;
         options = {
             ...{
-                ariaLabel: ( nls.localizeWithPath(
+                ariaLabel: ( localizeWithPath(
                     'vs/workbench/contrib/search/browser/patternInputWidget',
                     'defaultLabel',
                     "input"
@@ -107,7 +107,7 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
             inputBoxStyles: options.inputBoxStyles
         }, this.contextKeyService));
         this._register(this.inputBox.onDidChange(() => this._onSubmit.fire(true)));
-        this.inputFocusTracker = dom.trackFocus(this.inputBox.inputElement);
+        this.inputFocusTracker = trackFocus(this.inputBox.inputElement);
         this.onkeyup(this.inputBox.inputElement, (keyboardEvent) => this.onInputKeyUp(keyboardEvent));
         const controls = document.createElement('div');
         controls.className = 'controls';
@@ -157,7 +157,7 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
     renderSubcontrols(controlsDiv) {
         this.useSearchInEditorsBox = this._register(( new Toggle({
             icon: Codicon.book,
-            title: ( nls.localizeWithPath(
+            title: ( localizeWithPath(
                 'vs/workbench/contrib/search/browser/patternInputWidget',
                 'onlySearchInOpenEditors',
                 "Search only in Open Editors"
@@ -204,7 +204,7 @@ let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternI
         this.useExcludesAndIgnoreFilesBox = this._register(( new Toggle({
             icon: Codicon.exclude,
             actionClassName: 'useExcludesAndIgnoreFiles',
-            title: ( nls.localizeWithPath(
+            title: ( localizeWithPath(
                 'vs/workbench/contrib/search/browser/patternInputWidget',
                 'useExcludesAndIgnoreFilesDescription',
                 "Use Exclude Settings and Ignore Files"

package/vscode/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.js

@@ -1,16 +1,16 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ResourceSet } from 'monaco-editor/esm/vs/base/common/map.js';
-import { basenameOrAuthority, dirname } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { getSelectionKeyboardEvent } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ResourceSet } from 'vscode/vscode/vs/base/common/map';
+import { basenameOrAuthority, dirname } from 'vscode/vscode/vs/base/common/resources';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { getSelectionKeyboardEvent } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
-import { DefaultQuickAccessFilterValue } from 'monaco-editor/esm/vs/platform/quickinput/common/quickAccess.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { DefaultQuickAccessFilterValue } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
 import { searchDetailsIcon, searchOpenInFileIcon } from '../searchIcons.js';
 import { SearchModel, searchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';

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

@@ -1,5 +1,5 @@
 import { ReplacePreviewContentProvider } from './replaceService.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 
 function registerContributions() {

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

@@ -1,22 +1,22 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as network from 'monaco-editor/esm/vs/base/common/network.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
-import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { Match, MatchInNotebook, FileMatch, ISearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
-import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { createTextBufferFactoryFromSnapshot } from 'monaco-editor/esm/vs/editor/common/model/textModel.js';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { createTextBufferFactoryFromSnapshot } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
-import { ResourceTextEdit, IBulkEditService } from 'monaco-editor/esm/vs/editor/browser/services/bulkEditService.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { EditOperation } from 'monaco-editor/esm/vs/editor/common/core/editOperation.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { dirname } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { Promises } from 'monaco-editor/esm/vs/base/common/async.js';
+import { ResourceTextEdit, IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { dirname } from 'vscode/vscode/vs/base/common/resources';
+import { Promises } from 'vscode/vscode/vs/base/common/async';
 import { SaveSourceRegistry } from 'vscode/vscode/vs/workbench/common/editor';
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
@@ -24,7 +24,7 @@ import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/
 var ReplaceService_1;
 const REPLACE_PREVIEW = 'replacePreview';
 const toReplaceResource = (fileResource) => {
-    return fileResource.with({ scheme: network.Schemas.internal, fragment: REPLACE_PREVIEW, query: JSON.stringify({ scheme: fileResource.scheme }) });
+    return fileResource.with({ scheme: Schemas.internal, fragment: REPLACE_PREVIEW, query: JSON.stringify({ scheme: fileResource.scheme }) });
 };
 const toFileResource = (replaceResource) => {
     return replaceResource.with({ scheme: JSON.parse(replaceResource.query)['scheme'], fragment: '', query: '' });
@@ -33,7 +33,7 @@ let ReplacePreviewContentProvider = class ReplacePreviewContentProvider {
     constructor(instantiationService, textModelResolverService) {
         this.instantiationService = instantiationService;
         this.textModelResolverService = textModelResolverService;
-        this.textModelResolverService.registerTextModelContentProvider(network.Schemas.internal, this);
+        this.textModelResolverService.registerTextModelContentProvider(Schemas.internal, this);
     }
     provideTextContent(uri) {
         if (uri.fragment === REPLACE_PREVIEW) {
@@ -84,7 +84,7 @@ ReplacePreviewModel = ( __decorate([
 ], ReplacePreviewModel));
 let ReplaceService = class ReplaceService {
     static { ReplaceService_1 = this; }
-    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( nls.localizeWithPath(
+    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( localizeWithPath(
         'vs/workbench/contrib/search/browser/replaceService',
         'searchReplace.source',
         "Search and Replace"
@@ -101,7 +101,7 @@ let ReplaceService = class ReplaceService {
         const edits = this.createEdits(arg, resource);
         await this.bulkEditorService.apply(edits, { progress });
         const rawTextPromises = ( edits.map(async (e) => {
-            if (e.resource.scheme === network.Schemas.vscodeNotebookCell) {
+            if (e.resource.scheme === Schemas.vscodeNotebookCell) {
                 const notebookResource = CellUri.parse(e.resource)?.notebook;
                 if (notebookResource) {
                     let ref;
@@ -126,7 +126,7 @@ let ReplaceService = class ReplaceService {
         const editor = await this.editorService.openEditor({
             original: { resource: fileMatch.resource },
             modified: { resource: toReplaceResource(fileMatch.resource) },
-            label: ( nls.localizeWithPath(
+            label: ( localizeWithPath(
                 'vs/workbench/contrib/search/browser/replaceService',
                 'fileReplaceChanges',
                 "{0} ↔ {1} (Replace Preview)",