@codingame/monaco-vscode-api 2.0.3 → 2.1.0-update-vscode-1.86.1

package/vscode/src/vs/workbench/services/extensions/common/extensionsApiProposals.js

@@ -9,9 +9,10 @@ const allApiProposals = ( Object.freeze({
     chatProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
     chatRequestAccess: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatRequestAccess.d.ts',
     chatTab: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatTab.d.ts',
-    chatVariables: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatVariables.d.ts',
     codeActionAI: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codeActionAI.d.ts',
+    codeActionRanges: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codeActionRanges.d.ts',
     codiconDecoration: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codiconDecoration.d.ts',
+    commentReactor: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentReactor.d.ts',
     commentsDraftState: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentsDraftState.d.ts',
     contribCommentEditorActionsMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts',
     contribCommentPeekContext: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentPeekContext.d.ts',
@@ -21,9 +22,12 @@ const allApiProposals = ( Object.freeze({
     contribLabelFormatterWorkspaceTooltip: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribLabelFormatterWorkspaceTooltip.d.ts',
     contribMenuBarHome: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMenuBarHome.d.ts',
     contribMergeEditorMenus: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMergeEditorMenus.d.ts',
+    contribMultiDiffEditorMenus: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribMultiDiffEditorMenus.d.ts',
     contribNotebookStaticPreloads: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribNotebookStaticPreloads.d.ts',
     contribRemoteHelp: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribRemoteHelp.d.ts',
     contribShareMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribShareMenu.d.ts',
+    contribSourceControlHistoryItemGroupMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemGroupMenu.d.ts',
+    contribSourceControlHistoryItemMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts',
     contribSourceControlInputBoxMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlInputBoxMenu.d.ts',
     contribStatusBarItems: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribStatusBarItems.d.ts',
     contribViewsRemote: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribViewsRemote.d.ts',
@@ -31,6 +35,7 @@ const allApiProposals = ( Object.freeze({
     createFileSystemWatcher: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.createFileSystemWatcher.d.ts',
     customEditorMove: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.customEditorMove.d.ts',
     debugFocus: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.debugFocus.d.ts',
+    debugVisualization: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.debugVisualization.d.ts',
     defaultChatAgent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.defaultChatAgent.d.ts',
     diffCommand: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffCommand.d.ts',
     diffContentOptions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffContentOptions.d.ts',
@@ -50,7 +55,6 @@ const allApiProposals = ( Object.freeze({
     idToken: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.idToken.d.ts',
     inlineCompletionsAdditions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts',
     interactive: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactive.d.ts',
-    interactiveUserActions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactiveUserActions.d.ts',
     interactiveWindow: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactiveWindow.d.ts',
     ipc: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.ipc.d.ts',
     languageStatusText: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageStatusText.d.ts',
@@ -70,13 +74,10 @@ const allApiProposals = ( Object.freeze({
     quickDiffProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickDiffProvider.d.ts',
     quickPickItemTooltip: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickItemTooltip.d.ts',
     quickPickSortByLabel: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts',
-    readonlyMessage: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.readonlyMessage.d.ts',
     resolvers: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.resolvers.d.ts',
-    saveEditor: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.saveEditor.d.ts',
     scmActionButton: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmActionButton.d.ts',
     scmHistoryProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts',
-    scmInputBoxActionButton: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmInputBoxActionButton.d.ts',
-    scmInputBoxValueProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmInputBoxValueProvider.d.ts',
+    scmMultiDiffEditor: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmMultiDiffEditor.d.ts',
     scmSelectedProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts',
     scmTextDocument: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmTextDocument.d.ts',
     scmValidation: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmValidation.d.ts',
@@ -93,7 +94,6 @@ const allApiProposals = ( Object.freeze({
     terminalSelection: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalSelection.d.ts',
     testCoverage: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testCoverage.d.ts',
     testObserver: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts',
-    testingActiveProfile: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testingActiveProfile.d.ts',
     textSearchProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textSearchProvider.d.ts',
     timeline: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.timeline.d.ts',
     tokenInformation: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tokenInformation.d.ts',

package/vscode/src/vs/workbench/services/extensions/common/rpcProtocol.js

@@ -106,6 +106,7 @@ class RPCProtocol extends Disposable {
             delete this._pendingRPCReplies[msgId];
             pending.resolveErr(canceled());
         });
+        super.dispose();
     }
     drain() {
         if (typeof this._protocol.drain === 'function') {

package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.d.ts

@@ -1,13 +1,16 @@
 import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
 import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IBaseFileStat } from '../../../../platform/files/common/files.js';
 import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
 
 interface IAutoSaveConfiguration {
-    readonly autoSaveDelay?: number;
-    readonly autoSaveFocusChange: boolean;
-    readonly autoSaveApplicationChange: boolean;
+    autoSave?: 'afterDelay' | 'onFocusChange' | 'onWindowChange';
+    autoSaveDelay?: number;
+    autoSaveWorkspaceFilesOnly?: boolean;
+    autoSaveWhenNoErrors?: boolean;
 }
 declare const enum AutoSaveMode {
     OFF = 0,
@@ -16,20 +19,37 @@ declare const enum AutoSaveMode {
     ON_FOCUS_CHANGE = 3,
     ON_WINDOW_CHANGE = 4
 }
+declare const enum AutoSaveDisabledReason {
+    SETTINGS = 1,
+    OUT_OF_WORKSPACE = 2,
+    ERRORS = 3,
+    DISABLED = 4
+}
+type IAutoSaveMode = IEnabledAutoSaveMode | IDisabledAutoSaveMode;
+interface IEnabledAutoSaveMode {
+    readonly mode: AutoSaveMode.AFTER_SHORT_DELAY | AutoSaveMode.AFTER_LONG_DELAY | AutoSaveMode.ON_FOCUS_CHANGE | AutoSaveMode.ON_WINDOW_CHANGE;
+}
+interface IDisabledAutoSaveMode {
+    readonly mode: AutoSaveMode.OFF;
+    readonly reason: AutoSaveDisabledReason;
+}
 declare const IFilesConfigurationService: ServiceIdentifier<IFilesConfigurationService>;
 interface IFilesConfigurationService {
     readonly _serviceBrand: undefined;
-    readonly onAutoSaveConfigurationChange: Event<IAutoSaveConfiguration>;
-    getAutoSaveConfiguration(): IAutoSaveConfiguration;
-    getAutoSaveMode(): AutoSaveMode;
+    readonly onDidChangeAutoSaveConfiguration: Event<void>;
+    readonly onDidChangeAutoSaveDisabled: Event<URI>;
+    getAutoSaveConfiguration(resourceOrEditor: EditorInput | URI | undefined): IAutoSaveConfiguration;
+    hasShortAutoSaveDelay(resourceOrEditor: EditorInput | URI | undefined): boolean;
+    getAutoSaveMode(resourceOrEditor: EditorInput | URI | undefined): IAutoSaveMode;
     toggleAutoSave(): Promise<void>;
-    readonly onReadonlyChange: Event<void>;
+    disableAutoSave(resourceOrEditor: EditorInput | URI): IDisposable;
+    readonly onDidChangeReadonly: Event<void>;
     isReadonly(resource: URI, stat?: IBaseFileStat): boolean | IMarkdownString;
     updateReadonly(resource: URI, readonly: true | false | 'toggle' | 'reset'): Promise<void>;
-    readonly onFilesAssociationChange: Event<void>;
+    readonly onDidChangeFilesAssociation: Event<void>;
     readonly isHotExitEnabled: boolean;
     readonly hotExitConfiguration: string | undefined;
     preventSaveConflicts(resource: URI, language?: string): boolean;
 }
 
-export { AutoSaveMode, type IAutoSaveConfiguration, IFilesConfigurationService };
+export { AutoSaveDisabledReason, AutoSaveMode, type IAutoSaveConfiguration, type IAutoSaveMode, type IDisabledAutoSaveMode, type IEnabledAutoSaveMode, IFilesConfigurationService };

package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localizeWithPath } from '../../../../nls.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { Emitter } from '../../../../base/common/event.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { AutoSaveConfiguration, FILES_READONLY_INCLUDE_CONFIG, FILES_READONLY_EXCLUDE_CONFIG, HotExitConfiguration, hasReadonlyCapability, IFileService } from '../../../../platform/files/common/files.js';
@@ -13,13 +13,18 @@ import { ResourceGlobMatcher } from '../../../common/resources.js';
 import { GlobalIdleValue } from '../../../../base/common/async.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
-import { ResourceMap } from '../../../../base/common/map.js';
+import { LRUCache, ResourceMap } from '../../../../base/common/map.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { MarkerSeverity, IMarkerService } from '../../../../platform/markers/common/markers.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 var FilesConfigurationService_1;
 const AutoSaveAfterShortDelayContext = ( new RawContextKey('autoSaveAfterShortDelayContext', false, true));
 const IFilesConfigurationService = ( createDecorator('filesConfigurationService'));
 let FilesConfigurationService = class FilesConfigurationService extends Disposable {
     static { FilesConfigurationService_1 = this; }
     static { this.DEFAULT_AUTO_SAVE_MODE = isWeb ? AutoSaveConfiguration.AFTER_DELAY : AutoSaveConfiguration.OFF; }
+    static { this.DEFAULT_AUTO_SAVE_DELAY = 1000; }
     static { this.READONLY_MESSAGES = {
         providerReadonly: { value: ( localizeWithPath(
             'vs/workbench/services/filesConfiguration/common/filesConfigurationService',
@@ -50,27 +55,35 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
             "Editor is read-only because the file is read-only."
         )), isTrusted: true }
     }; }
-    constructor(contextKeyService, configurationService, contextService, environmentService, uriIdentityService, fileService) {
+    constructor(contextKeyService, configurationService, contextService, environmentService, uriIdentityService, fileService, markerService, textResourceConfigurationService) {
         super();
+        this.contextKeyService = contextKeyService;
         this.configurationService = configurationService;
         this.contextService = contextService;
         this.environmentService = environmentService;
         this.uriIdentityService = uriIdentityService;
         this.fileService = fileService;
-        this._onAutoSaveConfigurationChange = this._register(( new Emitter()));
-        this.onAutoSaveConfigurationChange = this._onAutoSaveConfigurationChange.event;
-        this._onFilesAssociationChange = this._register(( new Emitter()));
-        this.onFilesAssociationChange = this._onFilesAssociationChange.event;
-        this._onReadonlyConfigurationChange = this._register(( new Emitter()));
-        this.onReadonlyChange = this._onReadonlyConfigurationChange.event;
+        this.markerService = markerService;
+        this.textResourceConfigurationService = textResourceConfigurationService;
+        this._onDidChangeAutoSaveConfiguration = this._register(( new Emitter()));
+        this.onDidChangeAutoSaveConfiguration = this._onDidChangeAutoSaveConfiguration.event;
+        this._onDidChangeAutoSaveDisabled = this._register(( new Emitter()));
+        this.onDidChangeAutoSaveDisabled = this._onDidChangeAutoSaveDisabled.event;
+        this._onDidChangeFilesAssociation = this._register(( new Emitter()));
+        this.onDidChangeFilesAssociation = this._onDidChangeFilesAssociation.event;
+        this._onDidChangeReadonly = this._register(( new Emitter()));
+        this.onDidChangeReadonly = this._onDidChangeReadonly.event;
+        this.autoSaveConfigurationCache = ( new LRUCache(1000));
+        this.autoSaveDisabledOverrides = ( new ResourceMap());
+        this.autoSaveAfterShortDelayContext = AutoSaveAfterShortDelayContext.bindTo(this.contextKeyService);
         this.readonlyIncludeMatcher = this._register(( new GlobalIdleValue(() => this.createReadonlyMatcher(FILES_READONLY_INCLUDE_CONFIG))));
         this.readonlyExcludeMatcher = this._register(( new GlobalIdleValue(() => this.createReadonlyMatcher(FILES_READONLY_EXCLUDE_CONFIG))));
         this.sessionReadonlyOverrides = ( new ResourceMap(resource => this.uriIdentityService.extUri.getComparisonKey(resource)));
-        this.autoSaveAfterShortDelayContext = AutoSaveAfterShortDelayContext.bindTo(contextKeyService);
         const configuration = configurationService.getValue();
-        this.currentFilesAssociationConfig = configuration?.files?.associations;
-        this.currentHotExitConfig = configuration?.files?.hotExit || HotExitConfiguration.ON_EXIT;
-        this.onFilesConfigurationChange(configuration);
+        this.currentGlobalAutoSaveConfiguration = this.computeAutoSaveConfiguration(undefined, configuration.files);
+        this.currentFilesAssociationConfiguration = configuration?.files?.associations;
+        this.currentHotExitConfiguration = configuration?.files?.hotExit || HotExitConfiguration.ON_EXIT;
+        this.onFilesConfigurationChange(configuration, false);
         this.registerListeners();
     }
     createReadonlyMatcher(config) {
@@ -80,7 +93,7 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
             this.contextService,
             this.configurationService
         )));
-        this._register(matcher.onExpressionChange(() => this._onReadonlyConfigurationChange.fire()));
+        this._register(matcher.onExpressionChange(() => this._onDidChangeReadonly.fire()));
         return matcher;
     }
     isReadonly(resource, stat) {
@@ -123,78 +136,139 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
         else {
             this.sessionReadonlyOverrides.set(resource, readonly);
         }
-        this._onReadonlyConfigurationChange.fire();
+        this._onDidChangeReadonly.fire();
     }
     registerListeners() {
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('files')) {
-                this.onFilesConfigurationChange(this.configurationService.getValue());
+                this.onFilesConfigurationChange(this.configurationService.getValue(), true);
             }
         }));
     }
-    onFilesConfigurationChange(configuration) {
-        const autoSaveMode = configuration?.files?.autoSave || FilesConfigurationService_1.DEFAULT_AUTO_SAVE_MODE;
-        switch (autoSaveMode) {
-            case AutoSaveConfiguration.AFTER_DELAY:
-                this.configuredAutoSaveDelay = configuration?.files?.autoSaveDelay;
-                this.configuredAutoSaveOnFocusChange = false;
-                this.configuredAutoSaveOnWindowChange = false;
-                break;
-            case AutoSaveConfiguration.ON_FOCUS_CHANGE:
-                this.configuredAutoSaveDelay = undefined;
-                this.configuredAutoSaveOnFocusChange = true;
-                this.configuredAutoSaveOnWindowChange = false;
-                break;
-            case AutoSaveConfiguration.ON_WINDOW_CHANGE:
-                this.configuredAutoSaveDelay = undefined;
-                this.configuredAutoSaveOnFocusChange = false;
-                this.configuredAutoSaveOnWindowChange = true;
-                break;
-            default:
-                this.configuredAutoSaveDelay = undefined;
-                this.configuredAutoSaveOnFocusChange = false;
-                this.configuredAutoSaveOnWindowChange = false;
-                break;
+    onFilesConfigurationChange(configuration, fromEvent) {
+        this.currentGlobalAutoSaveConfiguration = this.computeAutoSaveConfiguration(undefined, configuration.files);
+        this.autoSaveConfigurationCache.clear();
+        this.autoSaveAfterShortDelayContext.set(this.getAutoSaveMode(undefined).mode === 1 );
+        if (fromEvent) {
+            this._onDidChangeAutoSaveConfiguration.fire();
         }
-        this.autoSaveAfterShortDelayContext.set(this.getAutoSaveMode() === 1 );
-        this._onAutoSaveConfigurationChange.fire(this.getAutoSaveConfiguration());
         const filesAssociation = configuration?.files?.associations;
-        if (!equals(this.currentFilesAssociationConfig, filesAssociation)) {
-            this.currentFilesAssociationConfig = filesAssociation;
-            this._onFilesAssociationChange.fire();
+        if (!equals(this.currentFilesAssociationConfiguration, filesAssociation)) {
+            this.currentFilesAssociationConfiguration = filesAssociation;
+            if (fromEvent) {
+                this._onDidChangeFilesAssociation.fire();
+            }
         }
         const hotExitMode = configuration?.files?.hotExit;
         if (hotExitMode === HotExitConfiguration.OFF || hotExitMode === HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE) {
-            this.currentHotExitConfig = hotExitMode;
+            this.currentHotExitConfiguration = hotExitMode;
         }
         else {
-            this.currentHotExitConfig = HotExitConfiguration.ON_EXIT;
+            this.currentHotExitConfiguration = HotExitConfiguration.ON_EXIT;
         }
         const readonlyFromPermissions = Boolean(configuration?.files?.readonlyFromPermissions);
         if (readonlyFromPermissions !== Boolean(this.configuredReadonlyFromPermissions)) {
             this.configuredReadonlyFromPermissions = readonlyFromPermissions;
-            this._onReadonlyConfigurationChange.fire();
+            if (fromEvent) {
+                this._onDidChangeReadonly.fire();
+            }
         }
     }
-    getAutoSaveMode() {
-        if (this.configuredAutoSaveOnFocusChange) {
-            return 3 ;
+    getAutoSaveConfiguration(resourceOrEditor) {
+        const resource = this.toResource(resourceOrEditor);
+        if (resource) {
+            let resourceAutoSaveConfiguration = this.autoSaveConfigurationCache.get(resource);
+            if (!resourceAutoSaveConfiguration) {
+                resourceAutoSaveConfiguration = this.computeAutoSaveConfiguration(resource, this.textResourceConfigurationService.getValue(resource, 'files'));
+                this.autoSaveConfigurationCache.set(resource, resourceAutoSaveConfiguration);
+            }
+            return resourceAutoSaveConfiguration;
         }
-        if (this.configuredAutoSaveOnWindowChange) {
-            return 4 ;
+        return this.currentGlobalAutoSaveConfiguration;
+    }
+    computeAutoSaveConfiguration(resource, filesConfiguration) {
+        let autoSave;
+        let autoSaveDelay;
+        let autoSaveWorkspaceFilesOnly;
+        let autoSaveWhenNoErrors;
+        let isOutOfWorkspace;
+        let isShortAutoSaveDelay;
+        switch (filesConfiguration.autoSave ?? FilesConfigurationService_1.DEFAULT_AUTO_SAVE_MODE) {
+            case AutoSaveConfiguration.AFTER_DELAY: {
+                autoSave = 'afterDelay';
+                autoSaveDelay = typeof filesConfiguration.autoSaveDelay === 'number' && filesConfiguration.autoSaveDelay >= 0 ? filesConfiguration.autoSaveDelay : FilesConfigurationService_1.DEFAULT_AUTO_SAVE_DELAY;
+                isShortAutoSaveDelay = autoSaveDelay <= FilesConfigurationService_1.DEFAULT_AUTO_SAVE_DELAY;
+                break;
+            }
+            case AutoSaveConfiguration.ON_FOCUS_CHANGE:
+                autoSave = 'onFocusChange';
+                break;
+            case AutoSaveConfiguration.ON_WINDOW_CHANGE:
+                autoSave = 'onWindowChange';
+                break;
         }
-        if (typeof this.configuredAutoSaveDelay === 'number' && this.configuredAutoSaveDelay >= 0) {
-            return this.configuredAutoSaveDelay <= 1000 ? 1  : 2 ;
+        if (filesConfiguration.autoSaveWorkspaceFilesOnly === true) {
+            autoSaveWorkspaceFilesOnly = true;
+            if (resource && !this.contextService.isInsideWorkspace(resource)) {
+                isOutOfWorkspace = true;
+                isShortAutoSaveDelay = undefined;
+            }
+        }
+        if (filesConfiguration.autoSaveWhenNoErrors === true) {
+            autoSaveWhenNoErrors = true;
+            isShortAutoSaveDelay = undefined;
         }
-        return 0 ;
-    }
-    getAutoSaveConfiguration() {
         return {
-            autoSaveDelay: typeof this.configuredAutoSaveDelay === 'number' && this.configuredAutoSaveDelay >= 0 ? this.configuredAutoSaveDelay : undefined,
-            autoSaveFocusChange: !!this.configuredAutoSaveOnFocusChange,
-            autoSaveApplicationChange: !!this.configuredAutoSaveOnWindowChange
+            autoSave,
+            autoSaveDelay,
+            autoSaveWorkspaceFilesOnly,
+            autoSaveWhenNoErrors,
+            isOutOfWorkspace,
+            isShortAutoSaveDelay
         };
     }
+    toResource(resourceOrEditor) {
+        if (resourceOrEditor instanceof EditorInput) {
+            return EditorResourceAccessor.getOriginalUri(resourceOrEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
+        }
+        return resourceOrEditor;
+    }
+    hasShortAutoSaveDelay(resourceOrEditor) {
+        const resource = this.toResource(resourceOrEditor);
+        if (this.getAutoSaveConfiguration(resource).isShortAutoSaveDelay) {
+            return !resource || !( this.autoSaveDisabledOverrides.has(resource));
+        }
+        return false;
+    }
+    getAutoSaveMode(resourceOrEditor) {
+        const resource = this.toResource(resourceOrEditor);
+        if (resource && ( this.autoSaveDisabledOverrides.has(resource))) {
+            return { mode: 0 , reason: 4  };
+        }
+        const autoSaveConfiguration = this.getAutoSaveConfiguration(resource);
+        if (typeof autoSaveConfiguration.autoSave === 'undefined') {
+            return { mode: 0 , reason: 1  };
+        }
+        if (resource) {
+            if (autoSaveConfiguration.autoSaveWorkspaceFilesOnly && autoSaveConfiguration.isOutOfWorkspace) {
+                return { mode: 0 , reason: 2  };
+            }
+            if (autoSaveConfiguration.autoSaveWhenNoErrors && this.markerService.read({ resource, take: 1, severities: MarkerSeverity.Error }).length > 0) {
+                return { mode: 0 , reason: 3  };
+            }
+        }
+        switch (autoSaveConfiguration.autoSave) {
+            case 'afterDelay':
+                if (typeof autoSaveConfiguration.autoSaveDelay === 'number' && autoSaveConfiguration.autoSaveDelay <= FilesConfigurationService_1.DEFAULT_AUTO_SAVE_DELAY) {
+                    return { mode: autoSaveConfiguration.autoSaveWhenNoErrors ? 2  : 1  };
+                }
+                return { mode: 2  };
+            case 'onFocusChange':
+                return { mode: 3  };
+            case 'onWindowChange':
+                return { mode: 4  };
+        }
+    }
     async toggleAutoSave() {
         const currentSetting = this.configurationService.getValue('files.autoSave');
         let newAutoSaveValue;
@@ -206,14 +280,35 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
         }
         return this.configurationService.updateValue('files.autoSave', newAutoSaveValue);
     }
+    disableAutoSave(resourceOrEditor) {
+        const resource = this.toResource(resourceOrEditor);
+        if (!resource) {
+            return Disposable.None;
+        }
+        const counter = this.autoSaveDisabledOverrides.get(resource) ?? 0;
+        this.autoSaveDisabledOverrides.set(resource, counter + 1);
+        if (counter === 0) {
+            this._onDidChangeAutoSaveDisabled.fire(resource);
+        }
+        return toDisposable(() => {
+            const counter = this.autoSaveDisabledOverrides.get(resource) ?? 0;
+            if (counter <= 1) {
+                this.autoSaveDisabledOverrides.delete(resource);
+                this._onDidChangeAutoSaveDisabled.fire(resource);
+            }
+            else {
+                this.autoSaveDisabledOverrides.set(resource, counter - 1);
+            }
+        });
+    }
     get isHotExitEnabled() {
         if (this.contextService.getWorkspace().transient) {
             return false;
         }
-        return this.currentHotExitConfig !== HotExitConfiguration.OFF;
+        return this.currentHotExitConfiguration !== HotExitConfiguration.OFF;
     }
     get hotExitConfiguration() {
-        return this.currentHotExitConfig;
+        return this.currentHotExitConfiguration;
     }
     preventSaveConflicts(resource, language) {
         return this.configurationService.getValue('files.saveConflictResolution', { resource, overrideIdentifier: language }) !== 'overwriteFileOnDisk';
@@ -225,6 +320,8 @@ FilesConfigurationService = FilesConfigurationService_1 = ( __decorate([
     ( __param(2, IWorkspaceContextService)),
     ( __param(3, IEnvironmentService)),
     ( __param(4, IUriIdentityService)),
-    ( __param(5, IFileService))
+    ( __param(5, IFileService)),
+    ( __param(6, IMarkerService)),
+    ( __param(7, ITextResourceConfigurationService))
 ], FilesConfigurationService));
 export { AutoSaveAfterShortDelayContext, FilesConfigurationService, IFilesConfigurationService };

package/vscode/src/vs/workbench/services/host/browser/host.d.ts

@@ -46,6 +46,14 @@ interface IHostService {
      * and auxiliary windows.
      */
     readonly onDidChangeActiveWindow: Event<number>;
+    /**
+     * Emitted when the window with the given identifier changes
+     * its fullscreen state.
+     */
+    readonly onDidChangeFullScreen: Event<{
+        windowId: number;
+        fullscreen: boolean;
+    }>;
     /**
      * Opens an empty window. The optional parameter allows to define if
      * a new window should open or the existing one change to an empty.