@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/services/search/common/queryBuilder.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { coalesce, flatten, distinct } from '../../../../base/common/arrays.js';
+import { coalesce, distinct } from '../../../../base/common/arrays.js';
 import { groupBy } from '../../../../base/common/collections.js';
 import { splitGlobAware } from '../../../../base/common/glob.js';
 import { untildify } from '../../../../base/common/labels.js';
@@ -14,11 +14,11 @@ import { isMultilineRegexSource } from '../../../../editor/common/model/textMode
 import { localizeWithPath } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
-import { toWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { toWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { IEditorGroupsService } from '../../editor/common/editorGroupsService.service.js';
 import { IPathService } from '../../path/common/pathService.service.js';
-import { pathIncludedInQuery, getExcludes } from './search.js';
+import { QueryType, pathIncludedInQuery, getExcludes } from './search.js';
 const _moduleId = "vs/workbench/services/search/common/queryBuilder";
 let QueryBuilder = class QueryBuilder {
     constructor(configurationService, workspaceContextService, editorGroupsService, logService, pathService) {
@@ -38,7 +38,7 @@ let QueryBuilder = class QueryBuilder {
         const commonQuery = this.commonQuery(folderResources?.map(toWorkspaceFolder), options);
         return {
             ...commonQuery,
-            type: 2 ,
+            type: QueryType.Text,
             contentPattern,
             previewOptions: options.previewOptions,
             maxFileSize: options.maxFileSize,
@@ -93,7 +93,7 @@ let QueryBuilder = class QueryBuilder {
         const commonQuery = this.commonQuery(folders, options);
         return {
             ...commonQuery,
-            type: 1 ,
+            type: QueryType.File,
             filePattern: options.filePattern
                 ? options.filePattern.trim()
                 : options.filePattern,
@@ -135,7 +135,7 @@ let QueryBuilder = class QueryBuilder {
             maxResults: options.maxResults
         };
         if (options.onlyOpenEditors) {
-            const openEditors = coalesce(flatten(( (this.editorGroupsService.groups.map(group => ( (group.editors.map(editor => editor.resource))))))));
+            const openEditors = coalesce(this.editorGroupsService.groups.flatMap(group => ( (group.editors.map(editor => editor.resource)))));
             this.logService.trace('QueryBuilder#commonQuery - openEditor URIs', JSON.stringify(openEditors));
             const openEditorsInQuery = openEditors.filter(editor => pathIncludedInQuery(queryProps, editor.fsPath));
             const openEditorsQueryProps = this.commonQueryFromFileList(openEditorsInQuery);
@@ -235,7 +235,7 @@ let QueryBuilder = class QueryBuilder {
         if (searchPaths && searchPaths.length) {
             result.searchPaths = searchPaths;
         }
-        const exprSegments = flatten(expandedExprSegments);
+        const exprSegments = expandedExprSegments.flat();
         const includePattern = patternListToIExpression(...exprSegments);
         if (includePattern) {
             result.pattern = includePattern;
@@ -290,7 +290,7 @@ let QueryBuilder = class QueryBuilder {
                     searchPath: URI.file(normalize(searchPath))
                 }];
         }
-        if (this.workspaceContextService.getWorkbenchState() === 2 ) {
+        if (this.workspaceContextService.getWorkbenchState() === WorkbenchState.FOLDER) {
             const workspaceUri = this.workspaceContextService.getWorkspace().folders[0].uri;
             searchPath = normalizeSlashes(searchPath);
             if (searchPath.startsWith('../') || searchPath === '..') {
@@ -467,7 +467,7 @@ function resolveResourcesForSearchIncludes(resources, contextService) {
     if (resources) {
         resources.forEach(resource => {
             let folderPath;
-            if (contextService.getWorkbenchState() === 2 ) {
+            if (contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
                 folderPath = relativePath(workspace.folders[0].uri, resource);
                 if (folderPath && folderPath !== '.') {
                     folderPath = './' + folderPath;

package/vscode/src/vs/workbench/services/search/common/replace.js

@@ -1,4 +1,5 @@
 import { createRegExp } from '../../../../base/common/strings.js';
+import { CharCode } from '../../../../base/common/charCode.js';
 import { buildReplaceStringWithCasePreserved } from '../../../../base/common/search.js';
 class ReplacePattern {
     constructor(replaceString, arg2, arg3) {
@@ -119,7 +120,7 @@ class ReplacePattern {
         let substrFrom = 0, result = '';
         for (let i = 0, len = replaceString.length; i < len; i++) {
             const chCode = replaceString.charCodeAt(i);
-            if (chCode === 92 ) {
+            if (chCode === CharCode.Backslash) {
                 i++;
                 if (i >= len) {
                     break;
@@ -127,13 +128,13 @@ class ReplacePattern {
                 const nextChCode = replaceString.charCodeAt(i);
                 let replaceWithCharacter = null;
                 switch (nextChCode) {
-                    case 92 :
+                    case CharCode.Backslash:
                         replaceWithCharacter = '\\';
                         break;
-                    case 110 :
+                    case CharCode.n:
                         replaceWithCharacter = '\n';
                         break;
-                    case 116 :
+                    case CharCode.t:
                         replaceWithCharacter = '\t';
                         break;
                 }
@@ -142,7 +143,7 @@ class ReplacePattern {
                     substrFrom = i + 1;
                 }
             }
-            if (chCode === 36 ) {
+            if (chCode === CharCode.DollarSign) {
                 i++;
                 if (i >= len) {
                     break;
@@ -150,16 +151,16 @@ class ReplacePattern {
                 const nextChCode = replaceString.charCodeAt(i);
                 let replaceWithCharacter = null;
                 switch (nextChCode) {
-                    case 48 :
+                    case CharCode.Digit0:
                         replaceWithCharacter = '$&';
                         this._hasParameters = true;
                         break;
-                    case 96 :
-                    case 39 :
+                    case CharCode.BackTick:
+                    case CharCode.SingleQuote:
                         this._hasParameters = true;
                         break;
                     default: {
-                        if (!this.between(nextChCode, 49 , 57 )) {
+                        if (!this.between(nextChCode, CharCode.Digit1, CharCode.Digit9)) {
                             break;
                         }
                         if (i === replaceString.length - 1) {
@@ -167,7 +168,7 @@ class ReplacePattern {
                             break;
                         }
                         let charCode = replaceString.charCodeAt(++i);
-                        if (!this.between(charCode, 48 , 57 )) {
+                        if (!this.between(charCode, CharCode.Digit0, CharCode.Digit9)) {
                             this._hasParameters = true;
                             --i;
                             break;
@@ -177,7 +178,7 @@ class ReplacePattern {
                             break;
                         }
                         charCode = replaceString.charCodeAt(++i);
-                        if (!this.between(charCode, 48 , 57 )) {
+                        if (!this.between(charCode, CharCode.Digit0, CharCode.Digit9)) {
                             this._hasParameters = true;
                             --i;
                             break;

package/vscode/src/vs/workbench/services/search/common/search.js

@@ -14,6 +14,18 @@ const SEARCH_EXCLUDE_CONFIG = 'search.exclude';
 const SEARCH_ELIDED_PREFIX = '⟪ ';
 const SEARCH_ELIDED_SUFFIX = ' characters skipped ⟫';
 const SEARCH_ELIDED_MIN_LEN = (SEARCH_ELIDED_PREFIX.length + SEARCH_ELIDED_SUFFIX.length + 5) * 2;
+var SearchProviderType;
+( (function(SearchProviderType) {
+    SearchProviderType[SearchProviderType["file"] = 0] = "file";
+    SearchProviderType[SearchProviderType["text"] = 1] = "text";
+    SearchProviderType[SearchProviderType["aiText"] = 2] = "aiText";
+})(SearchProviderType || (SearchProviderType = {})));
+var QueryType;
+( (function(QueryType) {
+    QueryType[QueryType["File"] = 1] = "File";
+    QueryType[QueryType["Text"] = 2] = "Text";
+    QueryType[QueryType["aiText"] = 3] = "aiText";
+})(QueryType || (QueryType = {})));
 function resultIsMatch(result) {
     return !!result.preview;
 }
@@ -23,6 +35,11 @@ function isFileMatch(p) {
 function isProgressMessage(p) {
     return !!p.message;
 }
+var SearchCompletionExitCode;
+( (function(SearchCompletionExitCode) {
+    SearchCompletionExitCode[SearchCompletionExitCode["Normal"] = 0] = "Normal";
+    SearchCompletionExitCode[SearchCompletionExitCode["NewSearchStarted"] = 1] = "NewSearchStarted";
+})(SearchCompletionExitCode || (SearchCompletionExitCode = {})));
 class FileMatch {
     constructor(resource) {
         this.resource = resource;
@@ -93,6 +110,20 @@ class OneLineRange extends SearchRange {
         super(lineNumber, startColumn, lineNumber, endColumn);
     }
 }
+var ViewMode;
+( (function(ViewMode) {
+    ViewMode["List"] = "list";
+    ViewMode["Tree"] = "tree";
+})(ViewMode || (ViewMode = {})));
+var SearchSortOrder;
+( (function(SearchSortOrder) {
+    SearchSortOrder["Default"] = "default";
+    SearchSortOrder["FileNames"] = "fileNames";
+    SearchSortOrder["Type"] = "type";
+    SearchSortOrder["Modified"] = "modified";
+    SearchSortOrder["CountDescending"] = "countDescending";
+    SearchSortOrder["CountAscending"] = "countAscending";
+})(SearchSortOrder || (SearchSortOrder = {})));
 function getExcludes(configuration, includeSearchExcludes = true) {
     const fileExcludes = configuration && configuration.files && configuration.files.exclude;
     const searchExcludes = includeSearchExcludes && configuration && configuration.search && configuration.search.exclude;
@@ -272,4 +303,4 @@ function listToMap(list) {
     }
     return map;
 }
-export { FileMatch, OneLineRange, QueryGlobTester, SEARCH_EXCLUDE_CONFIG, SEARCH_RESULT_LANGUAGE_ID, SearchError, SearchErrorCode, SearchRange, TextSearchMatch, VIEWLET_ID, VIEW_ID, deserializeSearchError, getExcludes, hasSiblingFn, hasSiblingPromiseFn, isFileMatch, isProgressMessage, pathIncludedInQuery, resolvePatternsForProvider, resultIsMatch };
+export { FileMatch, OneLineRange, QueryGlobTester, QueryType, SEARCH_EXCLUDE_CONFIG, SEARCH_RESULT_LANGUAGE_ID, SearchCompletionExitCode, SearchError, SearchErrorCode, SearchProviderType, SearchRange, SearchSortOrder, TextSearchMatch, VIEWLET_ID, VIEW_ID, ViewMode, deserializeSearchError, getExcludes, hasSiblingFn, hasSiblingPromiseFn, isFileMatch, isProgressMessage, pathIncludedInQuery, resolvePatternsForProvider, resultIsMatch };

package/vscode/src/vs/workbench/services/search/common/textSearchManager.js

@@ -1,4 +1,4 @@
-import { flatten, mapArrayOrNot } from '../../../../base/common/arrays.js';
+import { mapArrayOrNot } from '../../../../base/common/arrays.js';
 import { isThenable } from '../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
@@ -6,7 +6,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { basename } from '../../../../base/common/path.js';
 import { isEqual, relativePath, dirname } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
-import { resolvePatternsForProvider, QueryGlobTester, hasSiblingPromiseFn } from './search.js';
+import { QueryType, resolvePatternsForProvider, QueryGlobTester, hasSiblingPromiseFn } from './search.js';
 class TextSearchManager {
     constructor(queryProviderPair, fileUtils, processType) {
         this.queryProviderPair = queryProviderPair;
@@ -52,7 +52,7 @@ class TextSearchManager {
                 const someFolderHitLImit = ( results.some(result => !!result && !!result.limitHit));
                 resolve({
                     limitHit: this.isLimitHit || someFolderHitLImit,
-                    messages: flatten(( results.map(result => {
+                    messages: results.flatMap(result => {
                         if (!result?.message) {
                             return [];
                         }
@@ -62,7 +62,7 @@ class TextSearchManager {
                         else {
                             return [result.message];
                         }
-                    }))),
+                    }),
                     stats: {
                         type: this.processType
                     }
@@ -127,7 +127,7 @@ class TextSearchManager {
         };
         const searchOptions = this.getSearchOptionsForFolder(folderQuery);
         let result;
-        if (this.queryProviderPair.query.type === 3 ) {
+        if (this.queryProviderPair.query.type === QueryType.aiText) {
             result = await this.queryProviderPair.provider.provideAITextSearchResults(this.queryProviderPair.query.contentPattern, searchOptions, progress, token);
         }
         else {
@@ -172,7 +172,7 @@ class TextSearchManager {
             followSymlinks: !fq.ignoreSymlinks,
             encoding: fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding),
             maxFileSize: this.query.maxFileSize,
-            maxResults: this.query.maxResults,
+            maxResults: this.query.maxResults ?? Number.MAX_SAFE_INTEGER,
             previewOptions: this.query.previewOptions,
             afterContext: this.query.afterContext,
             beforeContext: this.query.beforeContext

package/vscode/src/vs/workbench/services/statusbar/browser/statusbar.js

@@ -1,3 +1,8 @@
+var StatusbarAlignment;
+( (function(StatusbarAlignment) {
+    StatusbarAlignment[StatusbarAlignment["LEFT"] = 0] = "LEFT";
+    StatusbarAlignment[StatusbarAlignment["RIGHT"] = 1] = "RIGHT";
+})(StatusbarAlignment || (StatusbarAlignment = {})));
 function isStatusbarEntryLocation(thing) {
     const candidate = thing;
     return typeof candidate?.id === 'string' && typeof candidate.alignment === 'number';
@@ -11,4 +16,4 @@ const ShowTooltipCommand = {
     title: ''
 };
 const StatusbarEntryKinds = ['standard', 'warning', 'error', 'prominent', 'remote', 'offline'];
-export { ShowTooltipCommand, StatusbarEntryKinds, isStatusbarEntryLocation, isStatusbarEntryPriority };
+export { ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKinds, isStatusbarEntryLocation, isStatusbarEntryPriority };

package/vscode/src/vs/workbench/services/storage/browser/storageService.js

@@ -10,7 +10,7 @@ import { DisposableStore, Disposable } from '../../../../base/common/lifecycle.j
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { Storage, isStorageItemsChangeEvent, InMemoryStorageDatabase } from '../../../../base/parts/storage/common/storage.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
-import { AbstractStorageService, isProfileUsingDefaultStorage, IS_NEW_KEY } from '../../../../platform/storage/common/storage.js';
+import { AbstractStorageService, StorageScope, isProfileUsingDefaultStorage, IS_NEW_KEY, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { isUserDataProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 var BrowserStorageService_1;
 let BrowserStorageService = class BrowserStorageService extends AbstractStorageService {
@@ -46,7 +46,7 @@ let BrowserStorageService = class BrowserStorageService extends AbstractStorageS
         const applicationStorageIndexedDB = await IndexedDBStorageDatabase.createApplicationStorage(this.logService);
         this.applicationStorageDatabase = this._register(applicationStorageIndexedDB);
         this.applicationStorage = this._register(( new Storage(this.applicationStorageDatabase)));
-        this._register(this.applicationStorage.onDidChangeStorage(e => this.emitDidChangeValue(-1 , e)));
+        this._register(this.applicationStorage.onDidChangeStorage(e => this.emitDidChangeValue(StorageScope.APPLICATION, e)));
         await this.applicationStorage.init();
         this.updateIsNew(this.applicationStorage);
         this.applicationStoragePromise.complete({ indexedDb: applicationStorageIndexedDB, storage: this.applicationStorage });
@@ -58,13 +58,13 @@ let BrowserStorageService = class BrowserStorageService extends AbstractStorageS
             const { indexedDb: applicationStorageIndexedDB, storage: applicationStorage } = await this.applicationStoragePromise.p;
             this.profileStorageDatabase = applicationStorageIndexedDB;
             this.profileStorage = applicationStorage;
-            this.profileStorageDisposables.add(this.profileStorage.onDidChangeStorage(e => this.emitDidChangeValue(0 , e)));
+            this.profileStorageDisposables.add(this.profileStorage.onDidChangeStorage(e => this.emitDidChangeValue(StorageScope.PROFILE, e)));
         }
         else {
             const profileStorageIndexedDB = await IndexedDBStorageDatabase.createProfileStorage(this.profileStorageProfile, this.logService);
             this.profileStorageDatabase = this.profileStorageDisposables.add(profileStorageIndexedDB);
             this.profileStorage = this.profileStorageDisposables.add(( new Storage(this.profileStorageDatabase)));
-            this.profileStorageDisposables.add(this.profileStorage.onDidChangeStorage(e => this.emitDidChangeValue(0 , e)));
+            this.profileStorageDisposables.add(this.profileStorage.onDidChangeStorage(e => this.emitDidChangeValue(StorageScope.PROFILE, e)));
             await this.profileStorage.init();
             this.updateIsNew(this.profileStorage);
         }
@@ -74,7 +74,7 @@ let BrowserStorageService = class BrowserStorageService extends AbstractStorageS
         const workspaceStorageIndexedDB = await IndexedDBStorageDatabase.createWorkspaceStorage(this.workspace.id, this.logService);
         this.workspaceStorageDatabase = this.workspaceStorageDisposables.add(workspaceStorageIndexedDB);
         this.workspaceStorage = this.workspaceStorageDisposables.add(( new Storage(this.workspaceStorageDatabase)));
-        this.workspaceStorageDisposables.add(this.workspaceStorage.onDidChangeStorage(e => this.emitDidChangeValue(1 , e)));
+        this.workspaceStorageDisposables.add(this.workspaceStorage.onDidChangeStorage(e => this.emitDidChangeValue(StorageScope.WORKSPACE, e)));
         await this.workspaceStorage.init();
         this.updateIsNew(this.workspaceStorage);
     }
@@ -89,9 +89,9 @@ let BrowserStorageService = class BrowserStorageService extends AbstractStorageS
     }
     getStorage(scope) {
         switch (scope) {
-            case -1 :
+            case StorageScope.APPLICATION:
                 return this.applicationStorage;
-            case 0 :
+            case StorageScope.PROFILE:
                 return this.profileStorage;
             default:
                 return this.workspaceStorage;
@@ -99,9 +99,9 @@ let BrowserStorageService = class BrowserStorageService extends AbstractStorageS
     }
     getLogDetails(scope) {
         switch (scope) {
-            case -1 :
+            case StorageScope.APPLICATION:
                 return this.applicationStorageDatabase?.name;
-            case 0 :
+            case StorageScope.PROFILE:
                 return this.profileStorageDatabase?.name;
             default:
                 return this.workspaceStorageDatabase?.name;
@@ -117,7 +117,7 @@ let BrowserStorageService = class BrowserStorageService extends AbstractStorageS
             await oldProfileStorage.close();
         }
         await this.createProfileStorage(toProfile);
-        this.switchData(oldItems, assertIsDefined(this.profileStorage), 0 );
+        this.switchData(oldItems, assertIsDefined(this.profileStorage), StorageScope.PROFILE);
     }
     async switchToWorkspace(toWorkspace, preserveData) {
         const oldWorkspaceStorage = assertIsDefined(this.workspaceStorage);
@@ -125,7 +125,7 @@ let BrowserStorageService = class BrowserStorageService extends AbstractStorageS
         await oldWorkspaceStorage.close();
         this.workspace = toWorkspace;
         await this.createWorkspaceStorage();
-        this.switchData(oldItems, assertIsDefined(this.workspaceStorage), 1 );
+        this.switchData(oldItems, assertIsDefined(this.workspaceStorage), StorageScope.WORKSPACE);
     }
     shouldFlushWhenIdle() {
         return getActiveWindow().document.hasFocus() && !this.hasPendingUpdate;
@@ -139,8 +139,8 @@ let BrowserStorageService = class BrowserStorageService extends AbstractStorageS
         this.dispose();
     }
     async clear() {
-        for (const scope of [-1 , 0 , 1 ]) {
-            for (const target of [0 , 1 ]) {
+        for (const scope of [StorageScope.APPLICATION, StorageScope.PROFILE, StorageScope.WORKSPACE]) {
+            for (const target of [StorageTarget.USER, StorageTarget.MACHINE]) {
                 for (const key of ( this.keys(scope, target))) {
                     this.remove(key, scope);
                 }

package/vscode/src/vs/workbench/services/textfile/common/encoding.js

@@ -12,6 +12,10 @@ const ZERO_BYTE_DETECTION_BUFFER_MAX_LEN = 512;
 const NO_ENCODING_GUESS_MIN_BYTES = 512;
 const AUTO_ENCODING_GUESS_MIN_BYTES = 512 * 8;
 const AUTO_ENCODING_GUESS_MAX_BYTES = 512 * 128;
+var DecodeStreamErrorKind;
+( (function(DecodeStreamErrorKind) {
+    DecodeStreamErrorKind[DecodeStreamErrorKind["STREAM_IS_BINARY"] = 1] = "STREAM_IS_BINARY";
+})(DecodeStreamErrorKind || (DecodeStreamErrorKind = {})));
 class DecodeStreamError extends Error {
     constructor(message, decodeStreamErrorKind) {
         super(message);
@@ -67,7 +71,7 @@ function toDecodeStream(source, options) {
                 if (detected.seemsBinary && options.acceptTextOnly) {
                     throw ( new DecodeStreamError(
                         'Stream is binary but only text is accepted for decoding',
-                        1
+                        DecodeStreamErrorKind.STREAM_IS_BINARY
                     ));
                 }
                 detected.encoding = await options.overwriteEncoding(detected.encoding);
@@ -495,4 +499,4 @@ const SUPPORTED_ENCODINGS = {
         order: 47
     }
 };
-export { DecodeStreamError, SUPPORTED_ENCODINGS, UTF16be, UTF16be_BOM, UTF16le, UTF16le_BOM, UTF8, UTF8_BOM, UTF8_with_bom, detectEncodingByBOMFromBuffer, detectEncodingFromBuffer, encodingExists, toDecodeStream, toEncodeReadable, toNodeEncoding };
+export { DecodeStreamError, DecodeStreamErrorKind, SUPPORTED_ENCODINGS, UTF16be, UTF16be_BOM, UTF16le, UTF16le_BOM, UTF8, UTF8_BOM, UTF8_with_bom, detectEncodingByBOMFromBuffer, detectEncodingFromBuffer, encodingExists, toDecodeStream, toEncodeReadable, toNodeEncoding };

package/vscode/src/vs/workbench/services/textfile/common/textEditorService.js

@@ -17,6 +17,7 @@ import { IFileService } from '../../../../platform/files/common/files.service.js
 import { RegisteredEditorPriority } from '../../editor/common/editorResolverService.js';
 import { IEditorResolverService } from '../../editor/common/editorResolverService.service.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import '../../../../platform/instantiation/common/extensions.js';
 let TextEditorService = class TextEditorService extends Disposable {
     constructor(untitledTextEditorService, instantiationService, uriIdentityService, fileService, editorResolverService) {
         super();

package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js

@@ -3,11 +3,12 @@ import { localizeWithPath } from '../../../../nls.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { mark } from '../../../../base/common/performance.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
+import { TextFileResolveReason, TextFileEditorModelState, EncodingMode } from './textfiles.js';
 import { ITextFileService } from './textfiles.service.js';
-import { SaveSourceRegistry } from '../../../common/editor.js';
+import { SaveSourceRegistry, SaveReason } from '../../../common/editor.js';
 import { BaseTextEditorModel } from '../../../common/editor/textEditorModel.js';
 import { IWorkingCopyBackupService } from '../../workingCopy/common/workingCopyBackup.service.js';
-import { ETAG_DISABLED, NotModifiedSinceFileOperationError } from '../../../../platform/files/common/files.js';
+import { FileChangeType, FileOperationResult, ETAG_DISABLED, NotModifiedSinceFileOperationError } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
@@ -15,7 +16,7 @@ import { TaskSequentializer, timeout } from '../../../../base/common/async.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { basename } from '../../../../base/common/path.js';
 import { IWorkingCopyService } from '../../workingCopy/common/workingCopyService.service.js';
-import { NO_TYPE_ID } from '../../workingCopy/common/workingCopy.js';
+import { NO_TYPE_ID, WorkingCopyCapabilities } from '../../workingCopy/common/workingCopy.js';
 import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.service.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
@@ -67,7 +68,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         this._onDidChangeReadonly = this._register(( (new Emitter())));
         this.onDidChangeReadonly = this._onDidChangeReadonly.event;
         this.typeId = NO_TYPE_ID;
-        this.capabilities = 0 ;
+        this.capabilities = WorkingCopyCapabilities.None;
         this.name = basename(this.labelService.getUriLabel(this.resource));
         this.resourceHasExtension = !!extUri.extname(this.resource);
         this.versionId = 0;
@@ -92,14 +93,14 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         let fileEventImpactsModel = false;
         let newInOrphanModeGuess;
         if (this.inOrphanMode) {
-            const modelFileAdded = e.contains(this.resource, 1 );
+            const modelFileAdded = e.contains(this.resource, FileChangeType.ADDED);
             if (modelFileAdded) {
                 newInOrphanModeGuess = false;
                 fileEventImpactsModel = true;
             }
         }
         else {
-            const modelFileDeleted = e.contains(this.resource, 2 );
+            const modelFileDeleted = e.contains(this.resource, FileChangeType.DELETED);
             if (modelFileDeleted) {
                 newInOrphanModeGuess = true;
                 fileEventImpactsModel = true;
@@ -166,7 +167,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
                 await this.forceResolveFromFile();
             }
             catch (error) {
-                if (error.fileOperationResult !== 1 ) {
+                if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
                     undo();
                     throw error;
                 }
@@ -223,7 +224,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             ctime = Date.now();
             size = 0;
             etag = ETAG_DISABLED;
-            this.setOrphaned(error.fileOperationResult === 1 );
+            this.setOrphaned(error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND);
         }
         const preferredEncoding = await this.textFileService.encoding.getPreferredWriteEncoding(this.resource, this.preferredEncoding);
         this.resolveFromContent({
@@ -302,14 +303,14 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         }
         catch (error) {
             const result = error.fileOperationResult;
-            this.setOrphaned(result === 1 );
-            if (this.isResolved() && result === 2 ) {
+            this.setOrphaned(result === FileOperationResult.FILE_NOT_FOUND);
+            if (this.isResolved() && result === FileOperationResult.FILE_NOT_MODIFIED_SINCE) {
                 if (error instanceof NotModifiedSinceFileOperationError) {
                     this.updateLastResolvedFileStat(error.stat);
                 }
                 return;
             }
-            if (this.isResolved() && result === 1  && !forceReadFromFile) {
+            if (this.isResolved() && result === FileOperationResult.FILE_NOT_FOUND && !forceReadFromFile) {
                 return;
             }
             throw error;
@@ -350,7 +351,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             this.doCreateTextModel(content.resource, content.value);
         }
         this.setDirty(!!dirty);
-        this._onDidResolve.fire(options?.reason ?? 3 );
+        this._onDidResolve.fire(options?.reason ?? TextFileResolveReason.OTHER);
     }
     doCreateTextModel(resource, value) {
         this.trace('doCreateTextModel()');
@@ -461,19 +462,19 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             this.trace('save() - ignoring request for readonly resource');
             return false;
         }
-        if ((this.hasState(3 ) || this.hasState(5 )) &&
-            ((options.reason === 2  || options.reason === 3  || options.reason === 4) )) {
+        if ((this.hasState(TextFileEditorModelState.CONFLICT) || this.hasState(TextFileEditorModelState.ERROR)) &&
+            (options.reason === SaveReason.AUTO || options.reason === SaveReason.FOCUS_CHANGE || options.reason === SaveReason.WINDOW_CHANGE)) {
             this.trace('save() - ignoring auto save request for model that is in conflict or error');
             return false;
         }
         this.trace('save() - enter');
         await this.doSave(options);
         this.trace('save() - exit');
-        return this.hasState(0 );
+        return this.hasState(TextFileEditorModelState.SAVED);
     }
     async doSave(options) {
         if (typeof options.reason !== 'number') {
-            options.reason = 1 ;
+            options.reason = SaveReason.EXPLICIT;
         }
         let versionId = this.versionId;
         this.trace(`doSave(${versionId}) - enter with versionId ${versionId}`);
@@ -501,7 +502,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         return this.saveSequentializer.run(versionId, (async () => {
             if (this.isResolved() && !options.skipSaveParticipants) {
                 try {
-                    if (options.reason === 2  && typeof this.lastModelContentChangeFromUndoRedo === 'number') {
+                    if (options.reason === SaveReason.AUTO && typeof this.lastModelContentChangeFromUndoRedo === 'number') {
                         const timeFromUndoRedoToSave = Date.now() - this.lastModelContentChangeFromUndoRedo;
                         if (timeFromUndoRedoToSave < TextFileEditorModel_1.UNDO_REDO_SAVE_PARTICIPANTS_AUTO_SAVE_THROTTLE_THRESHOLD) {
                             await timeout(TextFileEditorModel_1.UNDO_REDO_SAVE_PARTICIPANTS_AUTO_SAVE_THROTTLE_THRESHOLD - timeFromUndoRedoToSave);
@@ -510,7 +511,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
                     if (!saveCancellation.token.isCancellationRequested) {
                         this.ignoreSaveFromSaveParticipants = true;
                         try {
-                            await this.textFileService.files.runSaveParticipants(this, { reason: options.reason ?? 1 , savedFrom: options.from }, saveCancellation.token);
+                            await this.textFileService.files.runSaveParticipants(this, { reason: options.reason ?? SaveReason.EXPLICIT, savedFrom: options.from }, saveCancellation.token);
                         }
                         finally {
                             this.ignoreSaveFromSaveParticipants = false;
@@ -574,7 +575,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         }
         this.setDirty(true);
         this.inErrorMode = true;
-        if (error.fileOperationResult === 3 ) {
+        if (error.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
             this.inConflictMode = true;
         }
         this.textFileService.files.saveErrorHandler.onSaveError(error, this, options);
@@ -599,17 +600,17 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
     }
     hasState(state) {
         switch (state) {
-            case 3 :
+            case TextFileEditorModelState.CONFLICT:
                 return this.inConflictMode;
-            case 1 :
+            case TextFileEditorModelState.DIRTY:
                 return this.dirty;
-            case 5 :
+            case TextFileEditorModelState.ERROR:
                 return this.inErrorMode;
-            case 4 :
+            case TextFileEditorModelState.ORPHAN:
                 return this.inOrphanMode;
-            case 2 :
+            case TextFileEditorModelState.PENDING_SAVE:
                 return this.saveSequentializer.isRunning();
-            case 0 :
+            case TextFileEditorModelState.SAVED:
                 return !this.dirty;
         }
     }
@@ -641,14 +642,14 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             return;
         }
         this.logService.info(`Adjusting encoding based on configured language override to '${encoding}' for ${( (this.resource.toString(true)))}.`);
-        return this.setEncodingInternal(encoding, 1 );
+        return this.setEncodingInternal(encoding, EncodingMode.Decode);
     }
     setEncoding(encoding, mode) {
         this.hasEncodingSetExplicitly = true;
         return this.setEncodingInternal(encoding, mode);
     }
     async setEncodingInternal(encoding, mode) {
-        if (mode === 0 ) {
+        if (mode === EncodingMode.Encode) {
             this.updatePreferredEncoding(encoding);
             if (!this.isDirty()) {
                 this.versionId++;

package/vscode/src/vs/workbench/services/textfile/common/textfiles.js

@@ -1,16 +1,40 @@
-import { FileOperationError } from '../../../../platform/files/common/files.js';
+import { FileOperationError, FileOperationResult } from '../../../../platform/files/common/files.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
 import { isUndefinedOrNull, areFunctions } from '../../../../base/common/types.js';
+var TextFileOperationResult;
+( (function(TextFileOperationResult) {
+    TextFileOperationResult[TextFileOperationResult["FILE_IS_BINARY"] = 0] = "FILE_IS_BINARY";
+})(TextFileOperationResult || (TextFileOperationResult = {})));
 class TextFileOperationError extends FileOperationError {
     static isTextFileOperationError(obj) {
         return obj instanceof Error && !isUndefinedOrNull(obj.textFileOperationResult);
     }
     constructor(message, textFileOperationResult, options) {
-        super(message, 10 );
+        super(message, FileOperationResult.FILE_OTHER_ERROR);
         this.textFileOperationResult = textFileOperationResult;
         this.options = options;
     }
 }
+var TextFileEditorModelState;
+( (function(TextFileEditorModelState) {
+    TextFileEditorModelState[TextFileEditorModelState["SAVED"] = 0] = "SAVED";
+    TextFileEditorModelState[TextFileEditorModelState["DIRTY"] = 1] = "DIRTY";
+    TextFileEditorModelState[TextFileEditorModelState["PENDING_SAVE"] = 2] = "PENDING_SAVE";
+    TextFileEditorModelState[TextFileEditorModelState["CONFLICT"] = 3] = "CONFLICT";
+    TextFileEditorModelState[TextFileEditorModelState["ORPHAN"] = 4] = "ORPHAN";
+    TextFileEditorModelState[TextFileEditorModelState["ERROR"] = 5] = "ERROR";
+})(TextFileEditorModelState || (TextFileEditorModelState = {})));
+var TextFileResolveReason;
+( (function(TextFileResolveReason) {
+    TextFileResolveReason[TextFileResolveReason["EDITOR"] = 1] = "EDITOR";
+    TextFileResolveReason[TextFileResolveReason["REFERENCE"] = 2] = "REFERENCE";
+    TextFileResolveReason[TextFileResolveReason["OTHER"] = 3] = "OTHER";
+})(TextFileResolveReason || (TextFileResolveReason = {})));
+var EncodingMode;
+( (function(EncodingMode) {
+    EncodingMode[EncodingMode["Encode"] = 0] = "Encode";
+    EncodingMode[EncodingMode["Decode"] = 1] = "Decode";
+})(EncodingMode || (EncodingMode = {})));
 function isTextFileEditorModel(model) {
     const candidate = model;
     return areFunctions(candidate.setEncoding, candidate.getEncoding, candidate.save, candidate.revert, candidate.isDirty, candidate.getLanguageId);
@@ -44,4 +68,4 @@ function toBufferOrReadable(value) {
         }
     };
 }
-export { TextFileOperationError, isTextFileEditorModel, stringToSnapshot, toBufferOrReadable };
+export { EncodingMode, TextFileEditorModelState, TextFileOperationError, TextFileOperationResult, TextFileResolveReason, isTextFileEditorModel, stringToSnapshot, toBufferOrReadable };