@codingame/monaco-vscode-api 6.0.3 → 7.0.1

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

@@ -38,7 +38,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
         this._notebookService = _notebookService;
         this._notebookModelResolverService = _notebookModelResolverService;
         this._fileDialogService = _fileDialogService;
-        this._editorModelReference = null;
+        this.editorModelReference = null;
         this._defaultDirtyState = false;
         this._defaultDirtyState = !!options.startDirty;
         this._sideLoadedListener = _notebookService.onDidAddNotebookDocument(e => {
@@ -64,8 +64,8 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
     }
     dispose() {
         this._sideLoadedListener.dispose();
-        this._editorModelReference?.dispose();
-        this._editorModelReference = null;
+        this.editorModelReference?.dispose();
+        this.editorModelReference = null;
         super.dispose();
     }
     get typeId() {
@@ -79,8 +79,8 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
         if (this.resource.scheme === Schemas.untitled) {
             capabilities |= EditorInputCapabilities.Untitled;
         }
-        if (this._editorModelReference) {
-            if (this._editorModelReference.object.isReadonly()) {
+        if (this.editorModelReference) {
+            if (this.editorModelReference.object.isReadonly()) {
                 capabilities |= EditorInputCapabilities.Readonly;
             }
         }
@@ -95,53 +95,53 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
         return capabilities;
     }
     getDescription(verbosity = Verbosity.MEDIUM) {
-        if (!this.hasCapability(EditorInputCapabilities.Untitled) || this._editorModelReference?.object.hasAssociatedFilePath()) {
+        if (!this.hasCapability(EditorInputCapabilities.Untitled) || this.editorModelReference?.object.hasAssociatedFilePath()) {
             return super.getDescription(verbosity);
         }
         return undefined;
     }
     isReadonly() {
-        if (!this._editorModelReference) {
+        if (!this.editorModelReference) {
             return this.filesConfigurationService.isReadonly(this.resource);
         }
-        return this._editorModelReference.object.isReadonly();
+        return this.editorModelReference.object.isReadonly();
     }
     isDirty() {
-        if (!this._editorModelReference) {
+        if (!this.editorModelReference) {
             return this._defaultDirtyState;
         }
-        return this._editorModelReference.object.isDirty();
+        return this.editorModelReference.object.isDirty();
     }
     isSaving() {
-        const model = this._editorModelReference?.object;
+        const model = this.editorModelReference?.object;
         if (!model || !model.isDirty() || model.hasErrorState || this.hasCapability(EditorInputCapabilities.Untitled)) {
             return false;
         }
         return this.filesConfigurationService.hasShortAutoSaveDelay(this);
     }
     async save(group, options) {
-        if (this._editorModelReference) {
+        if (this.editorModelReference) {
             if (this.hasCapability(EditorInputCapabilities.Untitled)) {
                 return this.saveAs(group, options);
             }
             else {
-                await this._editorModelReference.object.save(options);
+                await this.editorModelReference.object.save(options);
             }
             return this;
         }
         return undefined;
     }
     async saveAs(group, options) {
-        if (!this._editorModelReference) {
+        if (!this.editorModelReference) {
             return undefined;
         }
         const provider = this._notebookService.getContributedNotebookType(this.viewType);
         if (!provider) {
             return undefined;
         }
-        const pathCandidate = this.hasCapability(EditorInputCapabilities.Untitled) ? await this._suggestName(provider, this.labelService.getUriBasenameLabel(this.resource)) : this._editorModelReference.object.resource;
+        const pathCandidate = this.hasCapability(EditorInputCapabilities.Untitled) ? await this._suggestName(provider, this.labelService.getUriBasenameLabel(this.resource)) : this.editorModelReference.object.resource;
         let target;
-        if (this._editorModelReference.object.hasAssociatedFilePath()) {
+        if (this.editorModelReference.object.hasAssociatedFilePath()) {
             target = pathCandidate;
         }
         else {
@@ -169,7 +169,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
                 `File name ${target} is not supported by ${provider.providerDisplayName}.\n\nPlease make sure the file name matches following patterns:\n${patterns}`
             )));
         }
-        return await this._editorModelReference.object.saveAs(target);
+        return await this.editorModelReference.object.saveAs(target);
     }
     async _suggestName(provider, suggestedFilename) {
         const firstSelector = provider.selectors[0];
@@ -192,14 +192,14 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
         return joinPath(await this._fileDialogService.defaultFilePath(), suggestedFilename);
     }
     async rename(group, target) {
-        if (this._editorModelReference) {
+        if (this.editorModelReference) {
             return { editor: { resource: target }, options: { override: this.viewType } };
         }
         return undefined;
     }
     async revert(_group, options) {
-        if (this._editorModelReference && this._editorModelReference.object.isDirty()) {
-            await this._editorModelReference.object.revert(options);
+        if (this.editorModelReference && this.editorModelReference.object.isDirty()) {
+            await this.editorModelReference.object.revert(options);
         }
     }
     async resolve(_options, perf) {
@@ -208,39 +208,40 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
         }
         perf?.mark('extensionActivated');
         this._sideLoadedListener.dispose();
-        if (!this._editorModelReference) {
-            const ref = await this._notebookModelResolverService.resolve(this.resource, this.viewType, this.ensureLimits(_options));
-            if (this._editorModelReference) {
+        if (!this.editorModelReference) {
+            const scratchpad = this.capabilities & EditorInputCapabilities.Scratchpad ? true : false;
+            const ref = await this._notebookModelResolverService.resolve(this.resource, this.viewType, { limits: this.ensureLimits(_options), scratchpad });
+            if (this.editorModelReference) {
                 ref.dispose();
-                return this._editorModelReference.object;
+                return this.editorModelReference.object;
             }
-            this._editorModelReference = ref;
+            this.editorModelReference = ref;
             if (this.isDisposed()) {
-                this._editorModelReference.dispose();
-                this._editorModelReference = null;
+                this.editorModelReference.dispose();
+                this.editorModelReference = null;
                 return null;
             }
-            this._register(this._editorModelReference.object.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
-            this._register(this._editorModelReference.object.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire()));
-            this._register(this._editorModelReference.object.onDidRevertUntitled(() => this.dispose()));
-            if (this._editorModelReference.object.isDirty()) {
+            this._register(this.editorModelReference.object.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
+            this._register(this.editorModelReference.object.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire()));
+            this._register(this.editorModelReference.object.onDidRevertUntitled(() => this.dispose()));
+            if (this.editorModelReference.object.isDirty()) {
                 this._onDidChangeDirty.fire();
             }
         }
         else {
-            this._editorModelReference.object.load({ limits: this.ensureLimits(_options) });
+            this.editorModelReference.object.load({ limits: this.ensureLimits(_options) });
         }
         if (this.options._backupId) {
-            const info = await this._notebookService.withNotebookDataProvider(this._editorModelReference.object.notebook.viewType);
+            const info = await this._notebookService.withNotebookDataProvider(this.editorModelReference.object.notebook.viewType);
             if (!(info instanceof SimpleNotebookProviderInfo)) {
                 throw ( (new Error('CANNOT open file notebook with this provider')));
             }
             const data = await info.serializer.dataToNotebook(VSBuffer.fromString(JSON.stringify({ __webview_backup: this.options._backupId })));
-            this._editorModelReference.object.notebook.applyEdits([
+            this.editorModelReference.object.notebook.applyEdits([
                 {
                     editType: CellEditType.Replace,
                     index: 0,
-                    count: this._editorModelReference.object.notebook.length,
+                    count: this.editorModelReference.object.notebook.length,
                     cells: data.cells
                 }
             ], true, undefined, () => undefined, undefined, false);
@@ -250,7 +251,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
                 this.options.startDirty = undefined;
             }
         }
-        return this._editorModelReference.object;
+        return this.editorModelReference.object;
     }
     toUntyped() {
         return {

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

@@ -7,6 +7,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { filter } from '../../../../base/common/objects.js';
 import { assertType } from '../../../../base/common/types.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { EditorModel } from '../../../common/editor/editorModel.js';
 import { NotebookCellsChangeType, NotebookSetting } from './notebookCommon.js';
@@ -147,12 +148,13 @@ SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = ( __decorate([
     ( __param(5, IFilesConfigurationService))
 ], SimpleNotebookEditorModel));
 class NotebookFileWorkingCopyModel extends Disposable {
-    constructor(_notebookModel, _notebookService, _configurationService, _telemetryService) {
+    constructor(_notebookModel, _notebookService, _configurationService, _telemetryService, _logService) {
         super();
         this._notebookModel = _notebookModel;
         this._notebookService = _notebookService;
         this._configurationService = _configurationService;
         this._telemetryService = _telemetryService;
+        this._logService = _logService;
         this._onDidChangeContent = this._register(( new Emitter()));
         this.onDidChangeContent = this._onDidChangeContent.event;
         this.configuration = undefined;
@@ -184,12 +186,17 @@ class NotebookFileWorkingCopyModel extends Disposable {
         }
     }
     async setSaveDelegate() {
-        const serializer = await this.getNotebookSerializer();
+        await this.getNotebookSerializer();
         this.save = async (options, token) => {
-            if (token.isCancellationRequested) {
-                throw ( new CancellationError());
-            }
             try {
+                let serializer = this._notebookService.tryGetDataProviderSync(this.notebookModel.viewType)?.serializer;
+                if (!serializer) {
+                    this._logService.warn('No serializer found for notebook model, checking if provider still needs to be resolved');
+                    serializer = await this.getNotebookSerializer();
+                }
+                if (token.isCancellationRequested) {
+                    throw ( new CancellationError());
+                }
                 const stat = await serializer.save(this._notebookModel.uri, this._notebookModel.versionId, options, token);
                 return stat;
             }
@@ -272,11 +279,12 @@ class NotebookFileWorkingCopyModel extends Disposable {
     }
 }
 let NotebookFileWorkingCopyModelFactory = class NotebookFileWorkingCopyModelFactory {
-    constructor(_viewType, _notebookService, _configurationService, _telemetryService) {
+    constructor(_viewType, _notebookService, _configurationService, _telemetryService, _logService) {
         this._viewType = _viewType;
         this._notebookService = _notebookService;
         this._configurationService = _configurationService;
         this._telemetryService = _telemetryService;
+        this._logService = _logService;
     }
     async createModel(resource, stream, token) {
         const info = await this._notebookService.withNotebookDataProvider(this._viewType);
@@ -293,13 +301,15 @@ let NotebookFileWorkingCopyModelFactory = class NotebookFileWorkingCopyModelFact
             notebookModel,
             this._notebookService,
             this._configurationService,
-            this._telemetryService
+            this._telemetryService,
+            this._logService
         ));
     }
 };
 NotebookFileWorkingCopyModelFactory = ( __decorate([
     ( __param(1, INotebookService)),
     ( __param(2, IConfigurationService)),
-    ( __param(3, ITelemetryService))
+    ( __param(3, ITelemetryService)),
+    ( __param(4, ILogService))
 ], NotebookFileWorkingCopyModelFactory));
 export { NotebookFileWorkingCopyModel, NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel };

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js

@@ -81,7 +81,7 @@ let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends Ba
             'aria-haspopup': 'true',
             'tabindex': '0'
         }, this.labelElement, this.detailsElement, this.dropDownElement);
-        this.anchorElementHover = this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.anchorElement, ''));
+        this.anchorElementHover = this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.anchorElement, ''));
         this._register(addDisposableListener(this.anchorElement, EventType.MOUSE_DOWN, e => EventHelper.stop(e)));
         this._register(addDisposableListener(this.anchorElement, EventType.CLICK, e => this.onClick(e)));
         this._register(addDisposableListener(this.container, EventType.KEY_UP, e => this.onKeyUp(e)));

package/vscode/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.js

@@ -599,10 +599,19 @@ function isExcludeSetting(setting) {
 function isIncludeSetting(setting) {
     return setting.key === 'files.readonlyInclude';
 }
-function isObjectRenderableSchema({ type }) {
-    return type === 'string' || type === 'boolean' || type === 'integer' || type === 'number';
+function objectSettingSupportsRemoveDefaultValue(key) {
+    return key === 'workbench.editor.customLabels.patterns';
 }
-function isObjectSetting({ type, objectProperties, objectPatternProperties, objectAdditionalProperties }) {
+function isObjectRenderableSchema({ type }, key) {
+    if (type === 'string' || type === 'boolean' || type === 'integer' || type === 'number') {
+        return true;
+    }
+    if (objectSettingSupportsRemoveDefaultValue(key) && Array.isArray(type) && type.length === 2) {
+        return type.includes('null') && (type.includes('string') || type.includes('boolean') || type.includes('integer') || type.includes('number'));
+    }
+    return false;
+}
+function isObjectSetting({ key, type, objectProperties, objectPatternProperties, objectAdditionalProperties }) {
     if (type !== 'object') {
         return false;
     }
@@ -625,7 +634,7 @@ function isObjectSetting({ type, objectProperties, objectPatternProperties, obje
         }
         return [schema];
     })).flat();
-    return flatSchemas.every(isObjectRenderableSchema);
+    return flatSchemas.every((schema) => isObjectRenderableSchema(schema, key));
 }
 function settingTypeEnumRenderable(_type) {
     const enumRenderableSettingTypes = ['string', 'boolean', 'null', 'integer', 'number'];
@@ -801,4 +810,4 @@ function parseQuery(query) {
         query,
     };
 }
-export { SearchResultIdx, SearchResultModel, SettingsTreeElement, SettingsTreeGroupElement, SettingsTreeModel, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement, inspectSetting, parseQuery, settingKeyToDisplayFormat };
+export { SearchResultIdx, SearchResultModel, SettingsTreeElement, SettingsTreeGroupElement, SettingsTreeModel, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement, inspectSetting, objectSettingSupportsRemoveDefaultValue, parseQuery, settingKeyToDisplayFormat };

package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js

@@ -14,7 +14,7 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { PANEL_BORDER } from '../../../common/theme.js';
 const _moduleId = "vs/workbench/contrib/preferences/common/settingsEditorColorRegistry";
 const settingsHeaderForeground = registerColor('settings.headerForeground', { light: '#444444', dark: '#e7e7e7', hcDark: '#ffffff', hcLight: '#292929' }, ( localizeWithPath(_moduleId, 0, "The foreground color for a section header or active title.")));
-const settingsHeaderHoverForeground = registerColor('settings.settingsHeaderHoverForeground', { light: ( (transparent(settingsHeaderForeground, 0.7))), dark: ( (transparent(settingsHeaderForeground, 0.7))), hcDark: ( (transparent(settingsHeaderForeground, 0.7))), hcLight: ( (transparent(settingsHeaderForeground, 0.7))) }, ( localizeWithPath(
+const settingsHeaderHoverForeground = registerColor('settings.settingsHeaderHoverForeground', ( (transparent(settingsHeaderForeground, 0.7))), ( localizeWithPath(
     _moduleId,
     1,
     "The foreground color for a section header or hovered title."
@@ -25,25 +25,25 @@ registerColor('settings.modifiedItemIndicator', {
     hcDark: ( (new Color( (new RGBA(0, 73, 122))))),
     hcLight: ( (new Color( (new RGBA(102, 175, 224))))),
 }, ( localizeWithPath(_moduleId, 2, "The color of the modified setting indicator.")));
-const settingsHeaderBorder = registerColor('settings.headerBorder', { dark: PANEL_BORDER, light: PANEL_BORDER, hcDark: PANEL_BORDER, hcLight: PANEL_BORDER }, ( localizeWithPath(_moduleId, 3, "The color of the header container border.")));
-const settingsSashBorder = registerColor('settings.sashBorder', { dark: PANEL_BORDER, light: PANEL_BORDER, hcDark: PANEL_BORDER, hcLight: PANEL_BORDER }, ( localizeWithPath(_moduleId, 4, "The color of the Settings editor splitview sash border.")));
-const settingsSelectBackground = registerColor(`settings.dropdownBackground`, { dark: selectBackground, light: selectBackground, hcDark: selectBackground, hcLight: selectBackground }, ( localizeWithPath(_moduleId, 5, "Settings editor dropdown background.")));
-const settingsSelectForeground = registerColor('settings.dropdownForeground', { dark: selectForeground, light: selectForeground, hcDark: selectForeground, hcLight: selectForeground }, ( localizeWithPath(_moduleId, 6, "Settings editor dropdown foreground.")));
-const settingsSelectBorder = registerColor('settings.dropdownBorder', { dark: selectBorder, light: selectBorder, hcDark: selectBorder, hcLight: selectBorder }, ( localizeWithPath(_moduleId, 7, "Settings editor dropdown border.")));
-const settingsSelectListBorder = registerColor('settings.dropdownListBorder', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localizeWithPath(
+const settingsHeaderBorder = registerColor('settings.headerBorder', PANEL_BORDER, ( localizeWithPath(_moduleId, 3, "The color of the header container border.")));
+const settingsSashBorder = registerColor('settings.sashBorder', PANEL_BORDER, ( localizeWithPath(_moduleId, 4, "The color of the Settings editor splitview sash border.")));
+const settingsSelectBackground = registerColor(`settings.dropdownBackground`, selectBackground, ( localizeWithPath(_moduleId, 5, "Settings editor dropdown background.")));
+const settingsSelectForeground = registerColor('settings.dropdownForeground', selectForeground, ( localizeWithPath(_moduleId, 6, "Settings editor dropdown foreground.")));
+const settingsSelectBorder = registerColor('settings.dropdownBorder', selectBorder, ( localizeWithPath(_moduleId, 7, "Settings editor dropdown border.")));
+const settingsSelectListBorder = registerColor('settings.dropdownListBorder', editorWidgetBorder, ( localizeWithPath(
     _moduleId,
     8,
     "Settings editor dropdown list border. This surrounds the options and separates the options from the description."
 )));
-registerColor('settings.checkboxBackground', { dark: checkboxBackground, light: checkboxBackground, hcDark: checkboxBackground, hcLight: checkboxBackground }, ( localizeWithPath(_moduleId, 9, "Settings editor checkbox background.")));
-registerColor('settings.checkboxForeground', { dark: checkboxForeground, light: checkboxForeground, hcDark: checkboxForeground, hcLight: checkboxForeground }, ( localizeWithPath(_moduleId, 10, "Settings editor checkbox foreground.")));
-registerColor('settings.checkboxBorder', { dark: checkboxBorder, light: checkboxBorder, hcDark: checkboxBorder, hcLight: checkboxBorder }, ( localizeWithPath(_moduleId, 11, "Settings editor checkbox border.")));
-const settingsTextInputBackground = registerColor('settings.textInputBackground', { dark: inputBackground, light: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, ( localizeWithPath(_moduleId, 12, "Settings editor text input box background.")));
-const settingsTextInputForeground = registerColor('settings.textInputForeground', { dark: inputForeground, light: inputForeground, hcDark: inputForeground, hcLight: inputForeground }, ( localizeWithPath(_moduleId, 13, "Settings editor text input box foreground.")));
-const settingsTextInputBorder = registerColor('settings.textInputBorder', { dark: inputBorder, light: inputBorder, hcDark: inputBorder, hcLight: inputBorder }, ( localizeWithPath(_moduleId, 14, "Settings editor text input box border.")));
-const settingsNumberInputBackground = registerColor('settings.numberInputBackground', { dark: inputBackground, light: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, ( localizeWithPath(_moduleId, 15, "Settings editor number input box background.")));
-const settingsNumberInputForeground = registerColor('settings.numberInputForeground', { dark: inputForeground, light: inputForeground, hcDark: inputForeground, hcLight: inputForeground }, ( localizeWithPath(_moduleId, 16, "Settings editor number input box foreground.")));
-const settingsNumberInputBorder = registerColor('settings.numberInputBorder', { dark: inputBorder, light: inputBorder, hcDark: inputBorder, hcLight: inputBorder }, ( localizeWithPath(_moduleId, 17, "Settings editor number input box border.")));
+registerColor('settings.checkboxBackground', checkboxBackground, ( localizeWithPath(_moduleId, 9, "Settings editor checkbox background.")));
+registerColor('settings.checkboxForeground', checkboxForeground, ( localizeWithPath(_moduleId, 10, "Settings editor checkbox foreground.")));
+registerColor('settings.checkboxBorder', checkboxBorder, ( localizeWithPath(_moduleId, 11, "Settings editor checkbox border.")));
+const settingsTextInputBackground = registerColor('settings.textInputBackground', inputBackground, ( localizeWithPath(_moduleId, 12, "Settings editor text input box background.")));
+const settingsTextInputForeground = registerColor('settings.textInputForeground', inputForeground, ( localizeWithPath(_moduleId, 13, "Settings editor text input box foreground.")));
+const settingsTextInputBorder = registerColor('settings.textInputBorder', inputBorder, ( localizeWithPath(_moduleId, 14, "Settings editor text input box border.")));
+const settingsNumberInputBackground = registerColor('settings.numberInputBackground', inputBackground, ( localizeWithPath(_moduleId, 15, "Settings editor number input box background.")));
+const settingsNumberInputForeground = registerColor('settings.numberInputForeground', inputForeground, ( localizeWithPath(_moduleId, 16, "Settings editor number input box foreground.")));
+const settingsNumberInputBorder = registerColor('settings.numberInputBorder', inputBorder, ( localizeWithPath(_moduleId, 17, "Settings editor number input box border.")));
 registerColor('settings.focusedRowBackground', {
     dark: ( (transparent(listHoverBackground, .6))),
     light: ( (transparent(listHoverBackground, .6))),
@@ -56,12 +56,7 @@ registerColor('settings.rowHoverBackground', {
     hcDark: null,
     hcLight: null
 }, ( localizeWithPath(_moduleId, 19, "The background color of a settings row when hovered.")));
-registerColor('settings.focusedRowBorder', {
-    dark: focusBorder,
-    light: focusBorder,
-    hcDark: focusBorder,
-    hcLight: focusBorder
-}, ( localizeWithPath(
+registerColor('settings.focusedRowBorder', focusBorder, ( localizeWithPath(
     _moduleId,
     20,
     "The color of the row's top and bottom border when the row is focused."

package/vscode/src/vs/workbench/contrib/remote/browser/media/tunnelView.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".ports-view .monaco-icon-label,.ports-view .monaco-list .monaco-list-row.focused .monaco-icon-label,.ports-view .monaco-list .monaco-list-row:hover:not(.highlighted) .monaco-icon-label{flex:1}.ports-view .monaco-list .monaco-list-row .actionBarContainer{flex:1 0 auto;flex:0 0 auto;text-align:right}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell{display:flex;flex:1;flex-wrap:nowrap;height:22px;overflow:hidden;text-overflow:ellipsis}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .monaco-inputbox{flex:1;height:22px;line-height:19px}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .monaco-inputbox input{margin-top:-40px}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .ports-view-actionbar-cell-localaddress:hover{text-decoration:underline}.ports-view .monaco-table-td[data-col-index=\"0\"],.ports-view .monaco-table-th,.ports-view .monaco-table-th[data-col-index=\"0\"]{padding-left:10px}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .monaco-button{line-height:1.4em;margin-bottom:3px;margin-left:3px;margin-top:4px;padding:2px 14px;width:auto}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell>.ports-view-actionbar-cell-icon.codicon{margin-top:3px;padding-right:3px}.ports-view .monaco-list .monaco-list-row.selected .ports-view-actionbar-cell>.ports-view-actionbar-cell-icon.codicon{color:currentColor!important}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .ports-view-actionbar-cell-resourceLabel .monaco-icon-label-container>.monaco-icon-name-container{flex:1}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .ports-view-actionbar-cell-resourceLabel:after{padding-right:0}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .actions{display:none}.ports-view .monaco-list .monaco-list-row.focused .ports-view-actionbar-cell .actions,.ports-view .monaco-list .monaco-list-row.selected .ports-view-actionbar-cell .actions,.ports-view .monaco-list .monaco-list-row:hover .ports-view-actionbar-cell .actions{display:block}.ports-view .monaco-list .ports-view-actionbar-cell .actions .action-label{background-position:50% 50%;background-repeat:no-repeat;background-size:16px;height:100%;padding:2px;width:16px}.monaco-workbench .codicon.codicon-ports-forwarded-with-process-icon{color:var(--vscode-ports-iconRunningProcessForeground)}";
+var css = ".ports-view .monaco-icon-label,.ports-view .monaco-list .monaco-list-row.focused .monaco-icon-label,.ports-view .monaco-list .monaco-list-row:hover:not(.highlighted) .monaco-icon-label{flex:1}.ports-view .monaco-list .monaco-list-row .actionBarContainer{flex:1 0 auto;flex:0 0 auto;text-align:right}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell{display:flex;flex:1;flex-wrap:nowrap;height:22px;overflow:hidden;text-overflow:ellipsis}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .monaco-inputbox{flex:1;height:22px;line-height:19px}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .monaco-inputbox input{margin-top:-40px}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .ports-view-actionbar-cell-localaddress{color:var(--vscode-textLink-foreground);text-decoration:var(--text-link-decoration)}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .ports-view-actionbar-cell-localaddress:hover{text-decoration:underline}.ports-view .monaco-table-td[data-col-index=\"0\"],.ports-view .monaco-table-th,.ports-view .monaco-table-th[data-col-index=\"0\"]{padding-left:10px}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .monaco-button{line-height:1.4em;margin-bottom:3px;margin-left:3px;margin-top:4px;padding:2px 14px;width:auto}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell>.ports-view-actionbar-cell-icon.codicon{margin-top:3px;padding-right:3px}.ports-view .monaco-list .monaco-list-row.selected .ports-view-actionbar-cell>.ports-view-actionbar-cell-icon.codicon{color:currentColor!important}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .ports-view-actionbar-cell-resourceLabel .monaco-icon-label-container>.monaco-icon-name-container{flex:1}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .ports-view-actionbar-cell-resourceLabel:after{padding-right:0}.ports-view .monaco-list .monaco-list-row .ports-view-actionbar-cell .actions{display:none}.ports-view .monaco-list .monaco-list-row.focused .ports-view-actionbar-cell .actions,.ports-view .monaco-list .monaco-list-row.selected .ports-view-actionbar-cell .actions,.ports-view .monaco-list .monaco-list-row:hover .ports-view-actionbar-cell .actions{display:block}.ports-view .monaco-list .ports-view-actionbar-cell .actions .action-label{background-position:50% 50%;background-repeat:no-repeat;background-size:16px;height:100%;padding:2px;width:16px}.monaco-workbench .codicon.codicon-ports-forwarded-with-process-icon{color:var(--vscode-ports-iconRunningProcessForeground)}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js

@@ -16,6 +16,7 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { Event } from '../../../../base/common/event.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.service.js';
 import { DisposableStore, toDisposable, Disposable, dispose } from '../../../../base/common/lifecycle.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
@@ -1513,23 +1514,24 @@ var SetTunnelProtocolAction;
     SetTunnelProtocolAction.ID_HTTPS = 'remote.tunnel.setProtocolHttps';
     SetTunnelProtocolAction.LABEL_HTTP = ( localizeWithPath(_moduleId, 54, "HTTP"));
     SetTunnelProtocolAction.LABEL_HTTPS = ( localizeWithPath(_moduleId, 55, "HTTPS"));
-    async function handler(arg, protocol, remoteExplorerService) {
+    async function handler(arg, protocol, remoteExplorerService, environmentService) {
         if (isITunnelItem(arg)) {
             const attributes = {
                 protocol
             };
-            return remoteExplorerService.tunnelModel.configPortsAttributes.addAttributes(arg.remotePort, attributes, ConfigurationTarget.USER_REMOTE);
+            const target = environmentService.remoteAuthority ? ConfigurationTarget.USER_REMOTE : ConfigurationTarget.USER_LOCAL;
+            return remoteExplorerService.tunnelModel.configPortsAttributes.addAttributes(arg.remotePort, attributes, target);
         }
     }
     function handlerHttp() {
         return async (accessor, arg) => {
-            return handler(arg, TunnelProtocol.Http, accessor.get(IRemoteExplorerService));
+            return handler(arg, TunnelProtocol.Http, accessor.get(IRemoteExplorerService), accessor.get(IWorkbenchEnvironmentService));
         };
     }
     SetTunnelProtocolAction.handlerHttp = handlerHttp;
     function handlerHttps() {
         return async (accessor, arg) => {
-            return handler(arg, TunnelProtocol.Https, accessor.get(IRemoteExplorerService));
+            return handler(arg, TunnelProtocol.Https, accessor.get(IRemoteExplorerService), accessor.get(IWorkbenchEnvironmentService));
         };
     }
     SetTunnelProtocolAction.handlerHttps = handlerHttps;
@@ -1761,12 +1763,7 @@ MenuRegistry.appendMenuItem(MenuId.TunnelLocalAddressInline, ({
     },
     when: isForwardedOrDetectedExpr
 }));
-registerColor('ports.iconRunningProcessForeground', {
-    light: STATUS_BAR_REMOTE_ITEM_BACKGROUND,
-    dark: STATUS_BAR_REMOTE_ITEM_BACKGROUND,
-    hcDark: STATUS_BAR_REMOTE_ITEM_BACKGROUND,
-    hcLight: STATUS_BAR_REMOTE_ITEM_BACKGROUND
-}, ( localizeWithPath(
+registerColor('ports.iconRunningProcessForeground', STATUS_BAR_REMOTE_ITEM_BACKGROUND, ( localizeWithPath(
     _moduleId,
     58,
     "The color of the icon for a port that has an associated running process."

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

@@ -867,45 +867,25 @@ const editorGutterAddedBackground = registerColor('editorGutter.addedBackground'
     hcDark: '#487E02',
     hcLight: '#48985D'
 }, ( localizeWithPath(_moduleId, 12, "Editor gutter background color for lines that are added.")));
-const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', {
-    dark: editorErrorForeground,
-    light: editorErrorForeground,
-    hcDark: editorErrorForeground,
-    hcLight: editorErrorForeground
-}, ( localizeWithPath(
+const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', editorErrorForeground, ( localizeWithPath(
     _moduleId,
     13,
     "Editor gutter background color for lines that are deleted."
 )));
-const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBackground', {
-    dark: editorGutterModifiedBackground,
-    light: editorGutterModifiedBackground,
-    hcDark: editorGutterModifiedBackground,
-    hcLight: editorGutterModifiedBackground
-}, ( localizeWithPath(
+const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBackground', editorGutterModifiedBackground, ( localizeWithPath(
     _moduleId,
     14,
     "Minimap gutter background color for lines that are modified."
 )));
-const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackground', {
-    dark: editorGutterAddedBackground,
-    light: editorGutterAddedBackground,
-    hcDark: editorGutterAddedBackground,
-    hcLight: editorGutterAddedBackground
-}, ( localizeWithPath(_moduleId, 15, "Minimap gutter background color for lines that are added.")));
-const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackground', {
-    dark: editorGutterDeletedBackground,
-    light: editorGutterDeletedBackground,
-    hcDark: editorGutterDeletedBackground,
-    hcLight: editorGutterDeletedBackground
-}, ( localizeWithPath(
+const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackground', editorGutterAddedBackground, ( localizeWithPath(_moduleId, 15, "Minimap gutter background color for lines that are added.")));
+const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackground', editorGutterDeletedBackground, ( localizeWithPath(
     _moduleId,
     16,
     "Minimap gutter background color for lines that are deleted."
 )));
-const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', { dark: ( (transparent(editorGutterModifiedBackground, 0.6))), light: ( (transparent(editorGutterModifiedBackground, 0.6))), hcDark: ( (transparent(editorGutterModifiedBackground, 0.6))), hcLight: ( (transparent(editorGutterModifiedBackground, 0.6))) }, ( localizeWithPath(_moduleId, 17, 'Overview ruler marker color for modified content.')));
-const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', { dark: ( (transparent(editorGutterAddedBackground, 0.6))), light: ( (transparent(editorGutterAddedBackground, 0.6))), hcDark: ( (transparent(editorGutterAddedBackground, 0.6))), hcLight: ( (transparent(editorGutterAddedBackground, 0.6))) }, ( localizeWithPath(_moduleId, 18, 'Overview ruler marker color for added content.')));
-const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', { dark: ( (transparent(editorGutterDeletedBackground, 0.6))), light: ( (transparent(editorGutterDeletedBackground, 0.6))), hcDark: ( (transparent(editorGutterDeletedBackground, 0.6))), hcLight: ( (transparent(editorGutterDeletedBackground, 0.6))) }, ( localizeWithPath(_moduleId, 19, 'Overview ruler marker color for deleted content.')));
+const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', ( (transparent(editorGutterModifiedBackground, 0.6))), ( localizeWithPath(_moduleId, 17, 'Overview ruler marker color for modified content.')));
+const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', ( (transparent(editorGutterAddedBackground, 0.6))), ( localizeWithPath(_moduleId, 18, 'Overview ruler marker color for added content.')));
+const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', ( (transparent(editorGutterDeletedBackground, 0.6))), ( localizeWithPath(_moduleId, 19, 'Overview ruler marker color for deleted content.')));
 let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends Disposable {
     static createDecoration(className, tooltip, options) {
         const decorationOptions = {

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

@@ -221,9 +221,8 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         }, disposables, token);
     }
     doGetPicks(filter, options, disposables, token) {
-        const configuration = { ...this.configuration, includeSymbols: options.includeSymbols ?? this.configuration.includeSymbols };
         const query = prepareQuery(filter);
-        if (options.enableEditorSymbolSearch && options.includeSymbols !== false) {
+        if (options.enableEditorSymbolSearch) {
             const editorSymbolPicks = this.getEditorSymbolPicks(query, disposables, token);
             if (editorSymbolPicks) {
                 return editorSymbolPicks;
@@ -281,7 +280,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                         additionalPicksExcludes.set(historyEditorPick.resource, true);
                     }
                 }
-                let additionalPicks = await this.getAdditionalPicks(query, additionalPicksExcludes, configuration.includeSymbols, token);
+                let additionalPicks = await this.getAdditionalPicks(query, additionalPicksExcludes, this.configuration.includeSymbols, token);
                 if (options.filter) {
                     additionalPicks = additionalPicks.filter((p) => options.filter?.(p));
                 }
@@ -289,7 +288,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                     return [];
                 }
                 return additionalPicks.length > 0 ? [
-                    { type: 'separator', label: configuration.includeSymbols ? ( localizeWithPath(_moduleId, 2, "file and symbol results")) : ( localizeWithPath(_moduleId, 3, "file results")) },
+                    { type: 'separator', label: this.configuration.includeSymbols ? ( localizeWithPath(_moduleId, 2, "file and symbol results")) : ( localizeWithPath(_moduleId, 3, "file results")) },
                     ...additionalPicks
                 ] : [];
             })(),

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

@@ -6,7 +6,7 @@ import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.service.js';
 import { INotebookService } from '../../../notebook/common/notebookService.service.js';
 import { contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from './searchNotebookHelpers.js';
-import { QueryType, pathIncludedInQuery } from '../../../../services/search/common/search.js';
+import { QueryType, pathIncludedInQuery, DEFAULT_MAX_SEARCH_RESULTS } from '../../../../services/search/common/search.js';
 import { ISearchService } from '../../../../services/search/common/search.service.js';
 import { coalesce } from '../../../../../base/common/arrays.js';
 import { isNumber } from '../../../../../base/common/types.js';
@@ -172,7 +172,7 @@ let NotebookSearchService = class NotebookSearchService {
             if (!widget.hasModel()) {
                 continue;
             }
-            const askMax = isNumber(query.maxResults) ? query.maxResults + 1 : Number.MAX_SAFE_INTEGER;
+            const askMax = (isNumber(query.maxResults) ? query.maxResults : DEFAULT_MAX_SEARCH_RESULTS) + 1;
             const uri = widget.viewModel.uri;
             if (!pathIncludedInQuery(query, uri.fsPath)) {
                 continue;

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

@@ -163,6 +163,7 @@ registerAction2(class FindInFilesAction extends Action2 {
                                 matchWholeWord: { 'type': 'boolean' },
                                 useExcludeSettingsAndIgnoreFiles: { 'type': 'boolean' },
                                 onlyOpenEditors: { 'type': 'boolean' },
+                                showIncludesExcludes: { 'type': 'boolean' }
                             }
                         }
                     },
@@ -345,6 +346,9 @@ async function findInFilesCommand(accessor, _args = {}) {
                     updatedText = openedView.updateTextFromFindWidgetOrSelection({ allowUnselectedWord: typeof args.replace !== 'string' });
                 }
                 openedView.setSearchParameters(args);
+                if (typeof args.showIncludesExcludes === 'boolean') {
+                    openedView.toggleQueryDetails(false, args.showIncludesExcludes);
+                }
                 openedView.searchAndReplaceWidget.focus(undefined, updatedText, updatedText);
             }
         });

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

@@ -45,7 +45,7 @@ import { isINotebookFileMatchWithModel, contentMatchesToTextSearchMatches, webvi
 import { INotebookSearchService } from '../common/notebookSearch.service.js';
 import { isINotebookFileMatchNoModel, rawCellPrefix } from '../common/searchNotebookHelpers.js';
 import { ReplacePattern } from '../../../services/search/common/replace.js';
-import { OneLineRange, resultIsMatch, SearchSortOrder, QueryType, SearchCompletionExitCode } from '../../../services/search/common/search.js';
+import { OneLineRange, resultIsMatch, DEFAULT_MAX_SEARCH_RESULTS, SearchSortOrder, QueryType, SearchCompletionExitCode } from '../../../services/search/common/search.js';
 import { ISearchService } from '../../../services/search/common/search.service.js';
 import { editorMatchesToTextSearchResults, getTextSearchMatchWithModelContext } from '../../../services/search/common/searchHelpers.js';
 import { CellSearchModel } from '../common/cellSearchModel.js';
@@ -428,7 +428,7 @@ let FileMatch = class FileMatch extends Disposable {
         this._textMatches = ( new Map());
         const wordSeparators = this._query.isWordMatch && this._query.wordSeparators ? this._query.wordSeparators : null;
         const matches = this._model
-            .findMatches(this._query.pattern, this._model.getFullModelRange(), !!this._query.isRegExp, !!this._query.isCaseSensitive, wordSeparators, false, this._maxResults ?? Number.MAX_SAFE_INTEGER);
+            .findMatches(this._query.pattern, this._model.getFullModelRange(), !!this._query.isRegExp, !!this._query.isCaseSensitive, wordSeparators, false, this._maxResults ?? DEFAULT_MAX_SEARCH_RESULTS);
         this.updateMatches(matches, true, this._model, false);
     }
     async updatesMatchesForLineAfterReplace(lineNumber, modelChange) {
@@ -444,7 +444,7 @@ let FileMatch = class FileMatch extends Disposable {
         const oldMatches = Array.from(( this._textMatches.values())).filter(match => match.range().startLineNumber === lineNumber);
         oldMatches.forEach(match => this._textMatches.delete(match.id()));
         const wordSeparators = this._query.isWordMatch && this._query.wordSeparators ? this._query.wordSeparators : null;
-        const matches = this._model.findMatches(this._query.pattern, range, !!this._query.isRegExp, !!this._query.isCaseSensitive, wordSeparators, false, this._maxResults ?? Number.MAX_SAFE_INTEGER);
+        const matches = this._model.findMatches(this._query.pattern, range, !!this._query.isRegExp, !!this._query.isCaseSensitive, wordSeparators, false, this._maxResults ?? DEFAULT_MAX_SEARCH_RESULTS);
         this.updateMatches(matches, modelChange, this._model, false);
     }
     updateMatches(matches, modelChange, model, isAiContributed) {