@codingame/monaco-vscode-api 5.3.0 → 6.0.0

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

@@ -1,9 +1,11 @@
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { CharCode } from '../../../../base/common/charCode.js';
 import { canceled, transformErrorForSerialization } from '../../../../base/common/errors.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { transformIncomingURIs } from '../../../../base/common/uriIpc.js';
 import { CanceledLazyPromise, LazyPromise } from './lazyPromise.js';
 import { getStringIdentifierForProxy, SerializableObjectWithBuffers, ProxyIdentifier } from './proxyIdentifier.js';
@@ -47,7 +49,7 @@ function parseJsonAndRestoreBufferRefs(jsonString, buffers, uriTransformer) {
             if (typeof ref === 'number') {
                 return buffers[ref];
             }
-            if (uriTransformer && value.$mid === 1 ) {
+            if (uriTransformer && value.$mid === MarshalledId.Uri) {
                 return uriTransformer.transformIncoming(value);
             }
         }
@@ -62,12 +64,22 @@ function createURIReplacer(transformer) {
         return null;
     }
     return (key, value) => {
-        if (value && value.$mid === 1 ) {
+        if (value && value.$mid === MarshalledId.Uri) {
             return transformer.transformOutgoing(value);
         }
         return value;
     };
 }
+var RequestInitiator;
+( (function(RequestInitiator) {
+    RequestInitiator[RequestInitiator["LocalSide"] = 0] = "LocalSide";
+    RequestInitiator[RequestInitiator["OtherSide"] = 1] = "OtherSide";
+})(RequestInitiator || (RequestInitiator = {})));
+var ResponsiveState;
+( (function(ResponsiveState) {
+    ResponsiveState[ResponsiveState["Responsive"] = 0] = "Responsive";
+    ResponsiveState[ResponsiveState["Unresponsive"] = 1] = "Unresponsive";
+})(ResponsiveState || (ResponsiveState = {})));
 const noop = () => { };
 const _RPCProtocolSymbol = Symbol.for('rpcProtocol');
 const _RPCProxySymbol = Symbol.for('rpcProxy');
@@ -93,7 +105,7 @@ class RPCProtocol extends Disposable {
         this._lastMessageId = 0;
         this._cancelInvokedHandlers = Object.create(null);
         this._pendingRPCReplies = {};
-        this._responsiveState = 0 ;
+        this._responsiveState = ResponsiveState.Responsive;
         this._unacknowledgedCount = 0;
         this._unresponsiveTime = 0;
         this._asyncCheckUresponsive = this._register(( new RunOnceScheduler(() => this._checkUnresponsive(), 1000)));
@@ -129,14 +141,14 @@ class RPCProtocol extends Disposable {
         if (this._unacknowledgedCount === 0) {
             this._asyncCheckUresponsive.cancel();
         }
-        this._setResponsiveState(0 );
+        this._setResponsiveState(ResponsiveState.Responsive);
     }
     _checkUnresponsive() {
         if (this._unacknowledgedCount === 0) {
             return;
         }
         if (Date.now() > this._unresponsiveTime) {
-            this._setResponsiveState(1 );
+            this._setResponsiveState(ResponsiveState.Unresponsive);
         }
         else {
             this._asyncCheckUresponsive.schedule();
@@ -168,7 +180,7 @@ class RPCProtocol extends Disposable {
     _createProxy(rpcId, debugName) {
         const handler = {
             get: (target, name) => {
-                if (typeof name === 'string' && !target[name] && name.charCodeAt(0) === 36 ) {
+                if (typeof name === 'string' && !target[name] && name.charCodeAt(0) === CharCode.DollarSign) {
                     target[name] = (...myArgs) => {
                         return this._remoteCall(rpcId, name, myArgs);
                     };
@@ -202,38 +214,38 @@ class RPCProtocol extends Disposable {
         const messageType = buff.readUInt8();
         const req = buff.readUInt32();
         switch (messageType) {
-            case 1 :
-            case 2 : {
+            case MessageType.RequestJSONArgs:
+            case MessageType.RequestJSONArgsWithCancellation: {
                 let { rpcId, method, args } = MessageIO.deserializeRequestJSONArgs(buff);
                 if (this._uriTransformer) {
                     args = transformIncomingURIs(args, this._uriTransformer);
                 }
-                this._receiveRequest(msgLength, req, rpcId, method, args, ((messageType === 2) ));
+                this._receiveRequest(msgLength, req, rpcId, method, args, (messageType === MessageType.RequestJSONArgsWithCancellation));
                 break;
             }
-            case 3 :
-            case 4 : {
+            case MessageType.RequestMixedArgs:
+            case MessageType.RequestMixedArgsWithCancellation: {
                 let { rpcId, method, args } = MessageIO.deserializeRequestMixedArgs(buff);
                 if (this._uriTransformer) {
                     args = transformIncomingURIs(args, this._uriTransformer);
                 }
-                this._receiveRequest(msgLength, req, rpcId, method, args, ((messageType === 4) ));
+                this._receiveRequest(msgLength, req, rpcId, method, args, (messageType === MessageType.RequestMixedArgsWithCancellation));
                 break;
             }
-            case 5 : {
-                this._logger?.logIncoming(msgLength, req, 0 , `ack`);
+            case MessageType.Acknowledged: {
+                this._logger?.logIncoming(msgLength, req, RequestInitiator.LocalSide, `ack`);
                 this._onDidReceiveAcknowledge(req);
                 break;
             }
-            case 6 : {
+            case MessageType.Cancel: {
                 this._receiveCancel(msgLength, req);
                 break;
             }
-            case 7 : {
+            case MessageType.ReplyOKEmpty: {
                 this._receiveReply(msgLength, req, undefined);
                 break;
             }
-            case 9 : {
+            case MessageType.ReplyOKJSON: {
                 let value = MessageIO.deserializeReplyOKJSON(buff);
                 if (this._uriTransformer) {
                     value = transformIncomingURIs(value, this._uriTransformer);
@@ -241,17 +253,17 @@ class RPCProtocol extends Disposable {
                 this._receiveReply(msgLength, req, value);
                 break;
             }
-            case 10 : {
+            case MessageType.ReplyOKJSONWithBuffers: {
                 const value = MessageIO.deserializeReplyOKJSONWithBuffers(buff, this._uriTransformer);
                 this._receiveReply(msgLength, req, value);
                 break;
             }
-            case 8 : {
+            case MessageType.ReplyOKVSBuffer: {
                 const value = MessageIO.deserializeReplyOKVSBuffer(buff);
                 this._receiveReply(msgLength, req, value);
                 break;
             }
-            case 11 : {
+            case MessageType.ReplyErrError: {
                 let err = MessageIO.deserializeReplyErrError(buff);
                 if (this._uriTransformer) {
                     err = transformIncomingURIs(err, this._uriTransformer);
@@ -259,7 +271,7 @@ class RPCProtocol extends Disposable {
                 this._receiveReplyErr(msgLength, req, err);
                 break;
             }
-            case 12 : {
+            case MessageType.ReplyErrEmpty: {
                 this._receiveReplyErr(msgLength, req, undefined);
                 break;
             }
@@ -269,7 +281,7 @@ class RPCProtocol extends Disposable {
         }
     }
     _receiveRequest(msgLength, req, rpcId, method, args, usesCancellationToken) {
-        this._logger?.logIncoming(msgLength, req, 1 , `receiveRequest ${getStringIdentifierForProxy(rpcId)}.${method}(`, args);
+        this._logger?.logIncoming(msgLength, req, RequestInitiator.OtherSide, `receiveRequest ${getStringIdentifierForProxy(rpcId)}.${method}(`, args);
         const callId = String(req);
         let promise;
         let cancel;
@@ -285,27 +297,27 @@ class RPCProtocol extends Disposable {
         }
         this._cancelInvokedHandlers[callId] = cancel;
         const msg = MessageIO.serializeAcknowledged(req);
-        this._logger?.logOutgoing(msg.byteLength, req, 1 , `ack`);
+        this._logger?.logOutgoing(msg.byteLength, req, RequestInitiator.OtherSide, `ack`);
         this._protocol.send(msg);
         promise.then((r) => {
             delete this._cancelInvokedHandlers[callId];
             const msg = MessageIO.serializeReplyOK(req, r, this._uriReplacer);
-            this._logger?.logOutgoing(msg.byteLength, req, 1 , `reply:`, r);
+            this._logger?.logOutgoing(msg.byteLength, req, RequestInitiator.OtherSide, `reply:`, r);
             this._protocol.send(msg);
         }, (err) => {
             delete this._cancelInvokedHandlers[callId];
             const msg = MessageIO.serializeReplyErr(req, err);
-            this._logger?.logOutgoing(msg.byteLength, req, 1 , `replyErr:`, err);
+            this._logger?.logOutgoing(msg.byteLength, req, RequestInitiator.OtherSide, `replyErr:`, err);
             this._protocol.send(msg);
         });
     }
     _receiveCancel(msgLength, req) {
-        this._logger?.logIncoming(msgLength, req, 1 , `receiveCancel`);
+        this._logger?.logIncoming(msgLength, req, RequestInitiator.OtherSide, `receiveCancel`);
         const callId = String(req);
         this._cancelInvokedHandlers[callId]?.();
     }
     _receiveReply(msgLength, req, value) {
-        this._logger?.logIncoming(msgLength, req, 0 , `receiveReply:`, value);
+        this._logger?.logIncoming(msgLength, req, RequestInitiator.LocalSide, `receiveReply:`, value);
         const callId = String(req);
         if (!this._pendingRPCReplies.hasOwnProperty(callId)) {
             return;
@@ -315,7 +327,7 @@ class RPCProtocol extends Disposable {
         pendingReply.resolveOk(value);
     }
     _receiveReplyErr(msgLength, req, value) {
-        this._logger?.logIncoming(msgLength, req, 0 , `receiveReplyErr:`, value);
+        this._logger?.logIncoming(msgLength, req, RequestInitiator.LocalSide, `receiveReplyErr:`, value);
         const callId = String(req);
         if (!this._pendingRPCReplies.hasOwnProperty(callId)) {
             return;
@@ -376,14 +388,14 @@ class RPCProtocol extends Disposable {
         if (cancellationToken) {
             disposable.add(cancellationToken.onCancellationRequested(() => {
                 const msg = MessageIO.serializeCancel(req);
-                this._logger?.logOutgoing(msg.byteLength, req, 0 , `cancel`);
+                this._logger?.logOutgoing(msg.byteLength, req, RequestInitiator.LocalSide, `cancel`);
                 this._protocol.send(MessageIO.serializeCancel(req));
             }));
         }
         this._pendingRPCReplies[callId] = ( new PendingRPCReply(result, disposable));
         this._onWillSendRequest(req);
         const msg = MessageIO.serializeRequest(req, rpcId, methodName, serializedRequestArguments, !!cancellationToken);
-        this._logger?.logOutgoing(msg.byteLength, req, 0 , `request: ${getStringIdentifierForProxy(rpcId)}.${methodName}(`, args);
+        this._logger?.logOutgoing(msg.byteLength, req, RequestInitiator.LocalSide, `request: ${getStringIdentifierForProxy(rpcId)}.${methodName}(`, args);
         this._protocol.send(msg);
         return result;
     }
@@ -504,13 +516,13 @@ class MessageBuffer {
             const el = arr[i];
             size += 1;
             switch (el.type) {
-                case 1 :
+                case ArgType.String:
                     size += this.sizeLongString(el.value);
                     break;
-                case 2 :
+                case ArgType.VSBuffer:
                     size += this.sizeVSBuffer(el.value);
                     break;
-                case 3 :
+                case ArgType.SerializedObjectWithBuffers:
                     size += this.sizeUInt32;
                     size += this.sizeLongString(el.value);
                     for (let i = 0; i < el.buffers.length; ++i) {
@@ -527,24 +539,24 @@ class MessageBuffer {
         for (let i = 0, len = arr.length; i < len; i++) {
             const el = arr[i];
             switch (el.type) {
-                case 1 :
-                    this.writeUInt8(1 );
+                case ArgType.String:
+                    this.writeUInt8(ArgType.String);
                     this.writeLongString(el.value);
                     break;
-                case 2 :
-                    this.writeUInt8(2 );
+                case ArgType.VSBuffer:
+                    this.writeUInt8(ArgType.VSBuffer);
                     this.writeVSBuffer(el.value);
                     break;
-                case 3 :
-                    this.writeUInt8(3 );
+                case ArgType.SerializedObjectWithBuffers:
+                    this.writeUInt8(ArgType.SerializedObjectWithBuffers);
                     this.writeUInt32(el.buffers.length);
                     this.writeLongString(el.value);
                     for (let i = 0; i < el.buffers.length; ++i) {
                         this.writeBuffer(el.buffers[i]);
                     }
                     break;
-                case 4 :
-                    this.writeUInt8(4 );
+                case ArgType.Undefined:
+                    this.writeUInt8(ArgType.Undefined);
                     break;
             }
         }
@@ -556,13 +568,13 @@ class MessageBuffer {
         for (let i = 0; i < arrLen; i++) {
             const argType = this.readUInt8();
             switch (argType) {
-                case 1 :
+                case ArgType.String:
                     arr[i] = this.readLongString();
                     break;
-                case 2 :
+                case ArgType.VSBuffer:
                     arr[i] = this.readVSBuffer();
                     break;
-                case 3 : {
+                case ArgType.SerializedObjectWithBuffers: {
                     const bufferCount = this.readUInt32();
                     const jsonString = this.readLongString();
                     const buffers = [];
@@ -572,7 +584,7 @@ class MessageBuffer {
                     arr[i] = ( new SerializableObjectWithBuffers(parseJsonAndRestoreBufferRefs(jsonString, buffers, null)));
                     break;
                 }
-                case 4 :
+                case ArgType.Undefined:
                     arr[i] = undefined;
                     break;
             }
@@ -580,6 +592,11 @@ class MessageBuffer {
         return arr;
     }
 }
+var SerializedRequestArgumentType;
+( (function(SerializedRequestArgumentType) {
+    SerializedRequestArgumentType[SerializedRequestArgumentType["Simple"] = 0] = "Simple";
+    SerializedRequestArgumentType[SerializedRequestArgumentType["Mixed"] = 1] = "Mixed";
+})(SerializedRequestArgumentType || (SerializedRequestArgumentType = {})));
 class MessageIO {
     static _useMixedArgSerialization(arr) {
         for (let i = 0, len = arr.length; i < len; i++) {
@@ -601,34 +618,34 @@ class MessageIO {
             for (let i = 0, len = args.length; i < len; i++) {
                 const arg = args[i];
                 if (arg instanceof VSBuffer) {
-                    massagedArgs[i] = { type: 2 , value: arg };
+                    massagedArgs[i] = { type: ArgType.VSBuffer, value: arg };
                 }
                 else if (typeof arg === 'undefined') {
-                    massagedArgs[i] = { type: 4  };
+                    massagedArgs[i] = { type: ArgType.Undefined };
                 }
                 else if (arg instanceof SerializableObjectWithBuffers) {
                     const { jsonString, referencedBuffers } = stringifyJsonWithBufferRefs(arg.value, replacer);
-                    massagedArgs[i] = { type: 3 , value: VSBuffer.fromString(jsonString), buffers: referencedBuffers };
+                    massagedArgs[i] = { type: ArgType.SerializedObjectWithBuffers, value: VSBuffer.fromString(jsonString), buffers: referencedBuffers };
                 }
                 else {
-                    massagedArgs[i] = { type: 1 , value: VSBuffer.fromString(stringify(arg, replacer)) };
+                    massagedArgs[i] = { type: ArgType.String, value: VSBuffer.fromString(stringify(arg, replacer)) };
                 }
             }
             return {
-                type: 1 ,
+                type: SerializedRequestArgumentType.Mixed,
                 args: massagedArgs,
             };
         }
         return {
-            type: 0 ,
+            type: SerializedRequestArgumentType.Simple,
             args: stringify(args, replacer)
         };
     }
     static serializeRequest(req, rpcId, method, serializedArgs, usesCancellationToken) {
         switch (serializedArgs.type) {
-            case 0 :
+            case SerializedRequestArgumentType.Simple:
                 return this._requestJSONArgs(req, rpcId, method, serializedArgs.args, usesCancellationToken);
-            case 1 :
+            case SerializedRequestArgumentType.Mixed:
                 return this._requestMixedArgs(req, rpcId, method, serializedArgs.args, usesCancellationToken);
         }
     }
@@ -639,7 +656,7 @@ class MessageIO {
         len += MessageBuffer.sizeUInt8();
         len += MessageBuffer.sizeShortString(methodBuff);
         len += MessageBuffer.sizeLongString(argsBuff);
-        const result = MessageBuffer.alloc(usesCancellationToken ? 2  : 1 , req, len);
+        const result = MessageBuffer.alloc(usesCancellationToken ? MessageType.RequestJSONArgsWithCancellation : MessageType.RequestJSONArgs, req, len);
         result.writeUInt8(rpcId);
         result.writeShortString(methodBuff);
         result.writeLongString(argsBuff);
@@ -661,7 +678,7 @@ class MessageIO {
         len += MessageBuffer.sizeUInt8();
         len += MessageBuffer.sizeShortString(methodBuff);
         len += MessageBuffer.sizeMixedArray(args);
-        const result = MessageBuffer.alloc(usesCancellationToken ? 4  : 3 , req, len);
+        const result = MessageBuffer.alloc(usesCancellationToken ? MessageType.RequestMixedArgsWithCancellation : MessageType.RequestMixedArgs, req, len);
         result.writeUInt8(rpcId);
         result.writeShortString(methodBuff);
         result.writeMixedArray(args);
@@ -688,10 +705,10 @@ class MessageIO {
         };
     }
     static serializeAcknowledged(req) {
-        return MessageBuffer.alloc(5 , req, 0).buffer;
+        return MessageBuffer.alloc(MessageType.Acknowledged, req, 0).buffer;
     }
     static serializeCancel(req) {
-        return MessageBuffer.alloc(6 , req, 0).buffer;
+        return MessageBuffer.alloc(MessageType.Cancel, req, 0).buffer;
     }
     static serializeReplyOK(req, res, replacer) {
         if (typeof res === 'undefined') {
@@ -709,12 +726,12 @@ class MessageIO {
         }
     }
     static _serializeReplyOKEmpty(req) {
-        return MessageBuffer.alloc(7 , req, 0).buffer;
+        return MessageBuffer.alloc(MessageType.ReplyOKEmpty, req, 0).buffer;
     }
     static _serializeReplyOKVSBuffer(req, res) {
         let len = 0;
         len += MessageBuffer.sizeVSBuffer(res);
-        const result = MessageBuffer.alloc(8 , req, len);
+        const result = MessageBuffer.alloc(MessageType.ReplyOKVSBuffer, req, len);
         result.writeVSBuffer(res);
         return result.buffer;
     }
@@ -725,7 +742,7 @@ class MessageIO {
         const resBuff = VSBuffer.fromString(res);
         let len = 0;
         len += MessageBuffer.sizeLongString(resBuff);
-        const result = MessageBuffer.alloc(9 , req, len);
+        const result = MessageBuffer.alloc(MessageType.ReplyOKJSON, req, len);
         result.writeLongString(resBuff);
         return result.buffer;
     }
@@ -737,7 +754,7 @@ class MessageIO {
         for (const buffer of buffers) {
             len += MessageBuffer.sizeVSBuffer(buffer);
         }
-        const result = MessageBuffer.alloc(10 , req, len);
+        const result = MessageBuffer.alloc(MessageType.ReplyOKJSONWithBuffers, req, len);
         result.writeUInt32(buffers.length);
         result.writeLongString(resBuff);
         for (const buffer of buffers) {
@@ -766,7 +783,7 @@ class MessageIO {
         const errBuff = VSBuffer.fromString(errStr);
         let len = 0;
         len += MessageBuffer.sizeLongString(errBuff);
-        const result = MessageBuffer.alloc(11 , req, len);
+        const result = MessageBuffer.alloc(MessageType.ReplyErrError, req, len);
         result.writeLongString(errBuff);
         return result.buffer;
     }
@@ -775,7 +792,29 @@ class MessageIO {
         return JSON.parse(err);
     }
     static _serializeReplyErrEmpty(req) {
-        return MessageBuffer.alloc(12 , req, 0).buffer;
+        return MessageBuffer.alloc(MessageType.ReplyErrEmpty, req, 0).buffer;
     }
 }
-export { RPCProtocol, parseJsonAndRestoreBufferRefs, stringifyJsonWithBufferRefs };
+var MessageType;
+( (function(MessageType) {
+    MessageType[MessageType["RequestJSONArgs"] = 1] = "RequestJSONArgs";
+    MessageType[MessageType["RequestJSONArgsWithCancellation"] = 2] = "RequestJSONArgsWithCancellation";
+    MessageType[MessageType["RequestMixedArgs"] = 3] = "RequestMixedArgs";
+    MessageType[MessageType["RequestMixedArgsWithCancellation"] = 4] = "RequestMixedArgsWithCancellation";
+    MessageType[MessageType["Acknowledged"] = 5] = "Acknowledged";
+    MessageType[MessageType["Cancel"] = 6] = "Cancel";
+    MessageType[MessageType["ReplyOKEmpty"] = 7] = "ReplyOKEmpty";
+    MessageType[MessageType["ReplyOKVSBuffer"] = 8] = "ReplyOKVSBuffer";
+    MessageType[MessageType["ReplyOKJSON"] = 9] = "ReplyOKJSON";
+    MessageType[MessageType["ReplyOKJSONWithBuffers"] = 10] = "ReplyOKJSONWithBuffers";
+    MessageType[MessageType["ReplyErrError"] = 11] = "ReplyErrError";
+    MessageType[MessageType["ReplyErrEmpty"] = 12] = "ReplyErrEmpty";
+})(MessageType || (MessageType = {})));
+var ArgType;
+( (function(ArgType) {
+    ArgType[ArgType["String"] = 1] = "String";
+    ArgType[ArgType["VSBuffer"] = 2] = "VSBuffer";
+    ArgType[ArgType["SerializedObjectWithBuffers"] = 3] = "SerializedObjectWithBuffers";
+    ArgType[ArgType["Undefined"] = 4] = "Undefined";
+})(ArgType || (ArgType = {})));
+export { RPCProtocol, RequestInitiator, ResponsiveState, parseJsonAndRestoreBufferRefs, stringifyJsonWithBufferRefs };

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../../nls.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -16,7 +17,7 @@ import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uri
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.service.js';
 import { LRUCache, ResourceMap } from '../../../../base/common/map.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
-import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { EditorResourceAccessor, SideBySideEditor, SaveReason } from '../../../common/editor.js';
 import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IMarkerService } from '../../../../platform/markers/common/markers.service.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
@@ -24,6 +25,21 @@ import '../../../../platform/instantiation/common/instantiation.js';
 var FilesConfigurationService_1;
 const _moduleId = "vs/workbench/services/filesConfiguration/common/filesConfigurationService";
 const AutoSaveAfterShortDelayContext = ( (new RawContextKey('autoSaveAfterShortDelayContext', false, true)));
+var AutoSaveMode;
+( ((function(AutoSaveMode) {
+    AutoSaveMode[AutoSaveMode["OFF"] = 0] = "OFF";
+    AutoSaveMode[AutoSaveMode["AFTER_SHORT_DELAY"] = 1] = "AFTER_SHORT_DELAY";
+    AutoSaveMode[AutoSaveMode["AFTER_LONG_DELAY"] = 2] = "AFTER_LONG_DELAY";
+    AutoSaveMode[AutoSaveMode["ON_FOCUS_CHANGE"] = 3] = "ON_FOCUS_CHANGE";
+    AutoSaveMode[AutoSaveMode["ON_WINDOW_CHANGE"] = 4] = "ON_WINDOW_CHANGE";
+})(AutoSaveMode || (AutoSaveMode = {}))));
+var AutoSaveDisabledReason;
+( ((function(AutoSaveDisabledReason) {
+    AutoSaveDisabledReason[AutoSaveDisabledReason["SETTINGS"] = 1] = "SETTINGS";
+    AutoSaveDisabledReason[AutoSaveDisabledReason["OUT_OF_WORKSPACE"] = 2] = "OUT_OF_WORKSPACE";
+    AutoSaveDisabledReason[AutoSaveDisabledReason["ERRORS"] = 3] = "ERRORS";
+    AutoSaveDisabledReason[AutoSaveDisabledReason["DISABLED"] = 4] = "DISABLED";
+})(AutoSaveDisabledReason || (AutoSaveDisabledReason = {}))));
 let FilesConfigurationService = class FilesConfigurationService extends Disposable {
     static { FilesConfigurationService_1 = this; }
     static { this.DEFAULT_AUTO_SAVE_MODE = isWeb ? AutoSaveConfiguration.AFTER_DELAY : AutoSaveConfiguration.OFF; }
@@ -147,7 +163,7 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
     onFilesConfigurationChange(configuration, fromEvent) {
         this.currentGlobalAutoSaveConfiguration = this.computeAutoSaveConfiguration(undefined, configuration.files);
         this.autoSaveConfigurationCache.clear();
-        this.autoSaveAfterShortDelayContext.set(this.getAutoSaveMode(undefined).mode === 1 );
+        this.autoSaveAfterShortDelayContext.set(this.getAutoSaveMode(undefined).mode === AutoSaveMode.AFTER_SHORT_DELAY);
         if (fromEvent) {
             this._onDidChangeAutoSaveConfiguration.fire();
         }
@@ -242,37 +258,37 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
     getAutoSaveMode(resourceOrEditor, saveReason) {
         const resource = this.toResource(resourceOrEditor);
         if (resource && ( (this.autoSaveDisabledOverrides.has(resource)))) {
-            return { mode: 0 , reason: 4  };
+            return { mode: AutoSaveMode.OFF, reason: AutoSaveDisabledReason.DISABLED };
         }
         const autoSaveConfiguration = this.getAutoSaveConfiguration(resource);
         if (typeof autoSaveConfiguration.autoSave === 'undefined') {
-            return { mode: 0 , reason: 1  };
+            return { mode: AutoSaveMode.OFF, reason: AutoSaveDisabledReason.SETTINGS };
         }
         if (typeof saveReason === 'number') {
-            if (((autoSaveConfiguration.autoSave === 'afterDelay' && saveReason !== 2) ) ||
-                ((autoSaveConfiguration.autoSave === 'onFocusChange' && saveReason !== 3  && saveReason !== 4) ) ||
-                ((autoSaveConfiguration.autoSave === 'onWindowChange' && saveReason !== 4) )) {
-                return { mode: 0 , reason: 1  };
+            if ((autoSaveConfiguration.autoSave === 'afterDelay' && saveReason !== SaveReason.AUTO) ||
+                (autoSaveConfiguration.autoSave === 'onFocusChange' && saveReason !== SaveReason.FOCUS_CHANGE && saveReason !== SaveReason.WINDOW_CHANGE) ||
+                (autoSaveConfiguration.autoSave === 'onWindowChange' && saveReason !== SaveReason.WINDOW_CHANGE)) {
+                return { mode: AutoSaveMode.OFF, reason: AutoSaveDisabledReason.SETTINGS };
             }
         }
         if (resource) {
             if (autoSaveConfiguration.autoSaveWorkspaceFilesOnly && autoSaveConfiguration.isOutOfWorkspace) {
-                return { mode: 0 , reason: 2  };
+                return { mode: AutoSaveMode.OFF, reason: AutoSaveDisabledReason.OUT_OF_WORKSPACE };
             }
             if (autoSaveConfiguration.autoSaveWhenNoErrors && this.markerService.read({ resource, take: 1, severities: MarkerSeverity.Error }).length > 0) {
-                return { mode: 0 , reason: 3  };
+                return { mode: AutoSaveMode.OFF, reason: AutoSaveDisabledReason.ERRORS };
             }
         }
         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: autoSaveConfiguration.autoSaveWhenNoErrors ? AutoSaveMode.AFTER_LONG_DELAY : AutoSaveMode.AFTER_SHORT_DELAY };
                 }
-                return { mode: 2  };
+                return { mode: AutoSaveMode.AFTER_LONG_DELAY };
             case 'onFocusChange':
-                return { mode: 3  };
+                return { mode: AutoSaveMode.ON_FOCUS_CHANGE };
             case 'onWindowChange':
-                return { mode: 4  };
+                return { mode: AutoSaveMode.ON_WINDOW_CHANGE };
         }
     }
     async toggleAutoSave() {
@@ -330,4 +346,4 @@ FilesConfigurationService = FilesConfigurationService_1 = ( (__decorate([
     ( (__param(6, IMarkerService))),
     ( (__param(7, ITextResourceConfigurationService)))
 ], FilesConfigurationService)));
-export { AutoSaveAfterShortDelayContext, FilesConfigurationService };
+export { AutoSaveAfterShortDelayContext, AutoSaveDisabledReason, AutoSaveMode, FilesConfigurationService };

package/vscode/src/vs/workbench/services/{views/browser/treeViewsService.service.js → integrity/common/integrity.service.js}

@@ -1,3 +1,3 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-const ITreeViewsService = ( createDecorator('treeViewsService'));
-export { ITreeViewsService };
+const IIntegrityService = ( createDecorator('integrityService'));
+export { IIntegrityService };

package/vscode/src/vs/workbench/services/language/common/languageService.js

@@ -9,11 +9,12 @@ import { IEnvironmentService } from '../../../../platform/environment/common/env
 import { FILES_ASSOCIATIONS_CONFIG } from '../../../../platform/files/common/files.js';
 import { IExtensionService } from '../../extensions/common/extensions.service.js';
 import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
-import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Extensions } from '../../extensionManagement/common/extensionFeatures.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { index } from '../../../../base/common/arrays.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 const _moduleId = "vs/workbench/services/language/common/languageService";